diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index 040a9841d72..cd51e047a64 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -94,8 +94,11 @@ libarch$(LIBEXT): $(NXOBJS) # A partially linked object containing only NuttX code (no interface to host OS) # Change the names of most symbols that conflict with libc symbols. -Linux-names.dat: nuttx-names.dat - @cp $^ $@ +GNU: + @mkdir ./GNU + +GNU/Linux-names.dat: GNU nuttx-names.dat + @cp nuttx-names.dat $@ Cygwin-names.dat: nuttx-names.dat @cat $^ | sed -e "s/^/_/g" >$@ diff --git a/arch/sim/src/up_blockdevice.c b/arch/sim/src/up_blockdevice.c index 243d8215f95..1146e418241 100644 --- a/arch/sim/src/up_blockdevice.c +++ b/arch/sim/src/up_blockdevice.c @@ -83,5 +83,5 @@ void up_registerblockdevice(void) { - rd_register(0, up_deviceimage(), NSECTORS, LOGICAL_SECTOR_SIZE, TRUE); + rd_register(0, (ubyte*)up_deviceimage(), NSECTORS, LOGICAL_SECTOR_SIZE, TRUE); } diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c index 4f639a88b65..fcfe9d24b0c 100644 --- a/arch/sim/src/up_initialize.c +++ b/arch/sim/src/up_initialize.c @@ -81,6 +81,15 @@ void up_initialize(void) { + /* The real purpose of the following is to make sure that lib_rawprintf + * is drawn into the link. It is needed by up_tapdev which is linked + * separately. + */ + +#ifdef CONFIG_NET + lib_rawprintf("SIM: Initializing"); +#endif + /* Register devices */ devnull_register(); /* Standard /dev/null */ diff --git a/arch/sim/src/up_uipdriver.c b/arch/sim/src/up_uipdriver.c index a035d753cb3..24f8f204eca 100644 --- a/arch/sim/src/up_uipdriver.c +++ b/arch/sim/src/up_uipdriver.c @@ -138,8 +138,6 @@ static int sim_uiptxpoll(struct uip_driver_s *dev) void uipdriver_loop(void) { - int i; - /* tapdev_read will return 0 on a timeout event and >0 on a data received event */ g_sim_dev.d_len = tapdev_read((unsigned char*)g_sim_dev.d_buf, CONFIG_NET_BUFSIZE);