From 78936f726077ae76c4ccfa436eca0bc83e4c71af Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 28 Nov 2013 17:47:03 -0600 Subject: [PATCH] Changes for ZDS-II ez80 build --- configs/ez80f910200kitg/ostest/Make.defs | 8 +++- configs/ez80f910200zco/dhcpd/Make.defs | 8 +++- configs/ez80f910200zco/httpd/Make.defs | 8 +++- configs/ez80f910200zco/nettest/Make.defs | 8 +++- configs/ez80f910200zco/nsh/Make.defs | 8 +++- configs/ez80f910200zco/ostest/Make.defs | 8 +++- configs/ez80f910200zco/poll/Make.defs | 8 +++- configs/olimex-lpc-h3131/README.txt | 3 +- configs/sama5d3x-ek/README.txt | 2 +- configs/z16f2800100zcog/ostest/Make.defs | 8 +++- configs/z16f2800100zcog/pashello/Make.defs | 8 +++- configs/z8encore000zco/ostest/Make.defs | 8 +++- configs/z8f64200100kit/ostest/Make.defs | 8 +++- include/nuttx/net/mii.h | 43 +++++++--------------- libc/.gitignore | 8 +--- libc/Makefile | 2 + libc/bin/.gitignore | 8 ++++ libc/kbin/.gitignore | 8 ++++ libc/ubin/.gitignore | 8 ++++ mm/.gitignore | 8 +--- mm/Makefile | 2 + mm/bin/.gitignore | 8 ++++ mm/kbin/.gitignore | 8 ++++ mm/ubin/.gitignore | 8 ++++ net/net_close.c | 4 +- net/uip/uip_tcpconn.c | 6 ++- tools/Config.mk | 25 ++++++++++++- 27 files changed, 177 insertions(+), 62 deletions(-) create mode 100644 libc/bin/.gitignore create mode 100644 libc/kbin/.gitignore create mode 100644 libc/ubin/.gitignore create mode 100644 mm/bin/.gitignore create mode 100644 mm/kbin/.gitignore create mode 100644 mm/ubin/.gitignore diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs index 601d754f9a..9f2cf1b22a 100644 --- a/configs/ez80f910200kitg/ostest/Make.defs +++ b/configs/ez80f910200kitg/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200kitg/ostest/Make.defs # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -180,6 +180,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/ez80f910200zco/dhcpd/Make.defs b/configs/ez80f910200zco/dhcpd/Make.defs index 144400c643..97fa1df170 100644 --- a/configs/ez80f910200zco/dhcpd/Make.defs +++ b/configs/ez80f910200zco/dhcpd/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/dhcpd/Make.defs # -# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -180,6 +180,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/ez80f910200zco/httpd/Make.defs b/configs/ez80f910200zco/httpd/Make.defs index 6cc369d970..b00ff64961 100644 --- a/configs/ez80f910200zco/httpd/Make.defs +++ b/configs/ez80f910200zco/httpd/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/httpd/Make.defs # -# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -180,6 +180,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/ez80f910200zco/nettest/Make.defs b/configs/ez80f910200zco/nettest/Make.defs index 13bf4476e0..6bd9c5c53e 100644 --- a/configs/ez80f910200zco/nettest/Make.defs +++ b/configs/ez80f910200zco/nettest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nettest/Make.defs # -# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -205,6 +205,12 @@ define COMPILE $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ASSEMBLE $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef diff --git a/configs/ez80f910200zco/nsh/Make.defs b/configs/ez80f910200zco/nsh/Make.defs index 550e1cf035..2def6601da 100644 --- a/configs/ez80f910200zco/nsh/Make.defs +++ b/configs/ez80f910200zco/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nsh/Make.defs # -# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -209,6 +209,12 @@ define ASSEMBLE $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE $(Q) for __obj in $(2) ; do \ echo "AR: $$__obj"; \ diff --git a/configs/ez80f910200zco/ostest/Make.defs b/configs/ez80f910200zco/ostest/Make.defs index 51d40c0bb1..edf7951557 100644 --- a/configs/ez80f910200zco/ostest/Make.defs +++ b/configs/ez80f910200zco/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/ostest/Make.defs # -# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -180,6 +180,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/ez80f910200zco/poll/Make.defs b/configs/ez80f910200zco/poll/Make.defs index 5149161fe8..dd7145b9b7 100644 --- a/configs/ez80f910200zco/poll/Make.defs +++ b/configs/ez80f910200zco/poll/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/poll/Make.defs # -# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -180,6 +180,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/olimex-lpc-h3131/README.txt b/configs/olimex-lpc-h3131/README.txt index 4f90d13c0c..46f0b1e449 100644 --- a/configs/olimex-lpc-h3131/README.txt +++ b/configs/olimex-lpc-h3131/README.txt @@ -658,11 +658,10 @@ Configurations support in the NSH configuration, please modify the NuttX configuration as follows: - [NOTE: USB host is under development. It is not yet functional.] - Drivers -> USB Host Driver Support CONFIG_USBHOST=y : General USB host support CONFIG_USBHOST_MSC=y : Mass storage class support + CONFIG_USBHOST_HIDKBD=? : HID keyboard class support CONFIG_USBHOST_INT_DISABLE=y : Not needed CONFIG_USBHOST_ISOC_DISABLE=y : Not needed diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt index acb16ce2dc..b51e0a705c 100644 --- a/configs/sama5d3x-ek/README.txt +++ b/configs/sama5d3x-ek/README.txt @@ -1660,7 +1660,7 @@ Configurations Application Configuration -> NSH Library CONFIG_NSH_ARCHINIT=y : NSH board-initialization - The Mass Storage Class (MSC) class driver is seleced for use with + The Mass Storage Class (MSC) class driver is selected for use with UDPHS: Device Drivers -> USB Device Driver Support diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs index eb706f5cd4..4664eb4e6b 100644 --- a/configs/z16f2800100zcog/ostest/Make.defs +++ b/configs/z16f2800100zcog/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/z16f2800100zcog/ostest/Make.defs # -# Copyright (C) 2008, 2010, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -173,6 +173,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs index 311aa65783..f4ac2f1261 100644 --- a/configs/z16f2800100zcog/pashello/Make.defs +++ b/configs/z16f2800100zcog/pashello/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/z16f2800100zcog/pashello/Make.defs # -# Copyright (C) 2008, 2010, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2010, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -173,6 +173,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/z8encore000zco/ostest/Make.defs b/configs/z8encore000zco/ostest/Make.defs index f18b3dda9b..2b3bdd4216 100644 --- a/configs/z8encore000zco/ostest/Make.defs +++ b/configs/z8encore000zco/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/z8encore000zco/ostest/Make.defs # -# Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -206,6 +206,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/configs/z8f64200100kit/ostest/Make.defs b/configs/z8f64200100kit/ostest/Make.defs index 278f724c34..b5cd95deeb 100644 --- a/configs/z8f64200100kit/ostest/Make.defs +++ b/configs/z8f64200100kit/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/z8f64200100kit/ostest/Make.defs # -# Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -206,6 +206,12 @@ define ASSEMBLE $(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"} endef +define MOVEOBJ + $(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj") + $(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst") + $(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src") +endef + define ARCHIVE @echo AR: $2 $(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) diff --git a/include/nuttx/net/mii.h b/include/nuttx/net/mii.h index b1403f03f0..749bdb2cc8 100644 --- a/include/nuttx/net/mii.h +++ b/include/nuttx/net/mii.h @@ -84,21 +84,6 @@ #define MII_DP83840_10BTSR 0x1b /* 10BASE-T status register */ #define MII_DP83840_10BTCR 0x1c /* 10BASE-T configuration register */ -/* National Semiconductor DP83848C: 0x8-0x15, 0x13, 0x1c reserved */ - -#define MII_DP83848C_PHYSTS 0x10 /* RO PHY Status Register */ -#define MII_DP83848C_MICR 0x11 /* RW MII Interrupt Control Register */ -#define MII_DP83848C_MISR 0x12 /* RO MII Interrupt Status Register */ -#define MII_DP83848C_FCSCR 0x14 /* RO False Carrier Sense Counter Register */ -#define MII_DP83848C_RECR 0x15 /* RO Receive Error Counter Register */ -#define MII_DP83848C_PCSR 0x16 /* RW PCS Sub-Layer Configuration and Status Register */ -#define MII_DP83848C_RBR 0x17 /* RW RMII and Bypass Register */ -#define MII_DP83848C_LEDCR 0x18 /* RW LED Direct Control Register */ -#define MII_DP83848C_PHYCR 0x19 /* RW PHY Control Register */ -#define MII_DP83848C_10BTSCR 0x1a /* RW 10Base-T Status/Control Register */ -#define MII_DP83848C_CDCTRL1 0x1b /* RW CD Test Control Register and BIST Extensions Register */ -#define MII_DP83848C_EDCR 0x1e /* RW Energy Detect */ - /* Am79c874: 0x08-0x0f, 0x14, 0x16, 0x19-0x1f reserved */ #define MII_AM79C874_NPADVERTISE 0x07 /* Auto-negotiation next page advertisement */ @@ -133,24 +118,24 @@ #define MII_KSZ8051_OMSS 0x17 /* Operation Mode Strap Status */ #define MII_KSZ8051_XCTRL 0x18 /* Expanded Control */ #define MII_KSZ8051_INT 0x1b /* Interrupt Control/Status */ -#define MII_KSZ8051+LINKMD 0x1d /* LinkMD(c) Control/Status */ +#define MII_KSZ8051_LINKMD 0x1d /* LinkMD(c) Control/Status */ #define MII_KSZ8051_PHYCTRL1 0x1e /* PHY Control 1 */ #define MII_KSZ8051_PHYCTRL2 0x1f /* PHY Control 2 */ -/* National Semiconductor DP83848C PHY Extended Registers */ +/* National Semiconductor DP83848C PHY Extended Registers. 0x8-0x15, 0x13, 0x1c reserved */ -#define MII_DP83848C_STS 0x10 /* Status Register */ -#define MII_DP83848C_MICR 0x11 /* MII Interrupt Control Register */ -#define MII_DP83848C_MISR 0x12 /* MII Interrupt Status Register */ -#define MII_DP83848C_FCSCR 0x14 /* False Carrier Sense Counter */ -#define MII_DP83848C_RECR 0x15 /* Receive Error Counter */ -#define MII_DP83848C_PCSR 0x16 /* PCS Sublayer Config. and Status */ -#define MII_DP83848C_RBR 0x17 /* RMII and Bypass Register */ -#define MII_DP83848C_LEDCR 0x18 /* LED Direct Control Register */ -#define MII_DP83848C_PHYCR 0x19 /* PHY Control Register */ -#define MII_DP83848C_10BTSCR 0x1a /* 10Base-T Status/Control Register */ -#define MII_DP83848C_CDCTRL1 0x1b /* CD Test Control and BIST Extens */ -#define MII_DP83848C_EDCR 0x1d /* Energy Detect Control Register */ +#define MII_DP83848C_STS 0x10 /* RO PHY Status Register */ +#define MII_DP83848C_MICR 0x11 /* RW MII Interrupt Control Register */ +#define MII_DP83848C_MISR 0x12 /* RO MII Interrupt Status Register */ +#define MII_DP83848C_FCSCR 0x14 /* RO False Carrier Sense Counter Register */ +#define MII_DP83848C_RECR 0x15 /* RO Receive Error Counter Register */ +#define MII_DP83848C_PCSR 0x16 /* RW PCS Sub-Layer Configuration and Status Register */ +#define MII_DP83848C_RBR 0x17 /* RW RMII and Bypass Register */ +#define MII_DP83848C_LEDCR 0x18 /* RW LED Direct Control Register */ +#define MII_DP83848C_PHYCR 0x19 /* RW PHY Control Register */ +#define MII_DP83848C_10BTSCR 0x1a /* RW 10Base-T Status/Control Register */ +#define MII_DP83848C_CDCTRL1 0x1b /* RW CD Test Control Register and BIST Extensions Register */ +#define MII_DP83848C_EDCR 0x1e /* RW Energy Detect Control Register */ /* SMSC LAN8720 PHY Extended Registers */ diff --git a/libc/.gitignore b/libc/.gitignore index 882c76e88e..44efe433f0 100644 --- a/libc/.gitignore +++ b/libc/.gitignore @@ -2,11 +2,5 @@ /Make_ubin.dep /Make_kbin.dep /.depend -/*.asm -/*.obj -/*.rel -/*.lst -/*.sym -/*.adb /*.lib -/*.src + diff --git a/libc/Makefile b/libc/Makefile index a303973e58..94884bd80a 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -92,9 +92,11 @@ all: $(BIN) $(AOBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) + $(call MOVEOBJ,$(patsubst $(BINDIR)$(DELIM)%$(OBJEXT),%,$@),$(BINDIR)) $(COBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.c $(call COMPILE, $<, $@) + $(call MOVEOBJ,$(patsubst $(BINDIR)$(DELIM)%$(OBJEXT),%,$@),$(BINDIR)) # C library for the flat build diff --git a/libc/bin/.gitignore b/libc/bin/.gitignore new file mode 100644 index 0000000000..4e358a8c57 --- /dev/null +++ b/libc/bin/.gitignore @@ -0,0 +1,8 @@ +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/libc/kbin/.gitignore b/libc/kbin/.gitignore new file mode 100644 index 0000000000..4e358a8c57 --- /dev/null +++ b/libc/kbin/.gitignore @@ -0,0 +1,8 @@ +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/libc/ubin/.gitignore b/libc/ubin/.gitignore new file mode 100644 index 0000000000..4e358a8c57 --- /dev/null +++ b/libc/ubin/.gitignore @@ -0,0 +1,8 @@ +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/mm/.gitignore b/mm/.gitignore index 882c76e88e..44efe433f0 100644 --- a/mm/.gitignore +++ b/mm/.gitignore @@ -2,11 +2,5 @@ /Make_ubin.dep /Make_kbin.dep /.depend -/*.asm -/*.obj -/*.rel -/*.lst -/*.sym -/*.adb /*.lib -/*.src + diff --git a/mm/Makefile b/mm/Makefile index efde7a79c3..ccc1bfc43c 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -84,9 +84,11 @@ all: $(BIN) $(AOBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) + $(call MOVEOBJ,$(patsubst $(BINDIR)$(DELIM)%$(OBJEXT),%,$@),$(BINDIR)) $(COBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.c $(call COMPILE, $<, $@) + $(call MOVEOBJ,$(patsubst $(BINDIR)$(DELIM)%$(OBJEXT),%,$@),$(BINDIR)) # Memory manager for the flat build diff --git a/mm/bin/.gitignore b/mm/bin/.gitignore new file mode 100644 index 0000000000..4e358a8c57 --- /dev/null +++ b/mm/bin/.gitignore @@ -0,0 +1,8 @@ +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/mm/kbin/.gitignore b/mm/kbin/.gitignore new file mode 100644 index 0000000000..4e358a8c57 --- /dev/null +++ b/mm/kbin/.gitignore @@ -0,0 +1,8 @@ +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/mm/ubin/.gitignore b/mm/ubin/.gitignore new file mode 100644 index 0000000000..4e358a8c57 --- /dev/null +++ b/mm/ubin/.gitignore @@ -0,0 +1,8 @@ +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/net/net_close.c b/net/net_close.c index 04735f4d95..0bd5960ef1 100644 --- a/net/net_close.c +++ b/net/net_close.c @@ -137,14 +137,14 @@ static uint16_t netclose_interrupt(FAR struct uip_driver_s *dev, #ifdef CONFIG_NET_TCP static inline void netclose_disconnect(FAR struct socket *psock) { + FAR struct uip_conn *conn; FAR struct uip_callback_s *cb; uip_lock_t flags; /* Interrupts are disabled here to avoid race conditions */ flags = uip_lock(); - - struct uip_conn *conn = (struct uip_conn*)psock->s_conn; + conn = (struct uip_conn*)psock->s_conn; /* There shouldn't be any callbacks registered */ diff --git a/net/uip/uip_tcpconn.c b/net/uip/uip_tcpconn.c index 3482300105..6e1eb6d9d4 100644 --- a/net/uip/uip_tcpconn.c +++ b/net/uip/uip_tcpconn.c @@ -227,7 +227,9 @@ struct uip_conn *uip_tcpalloc(void) * that is in the UIP_TIME_WAIT or UIP_FIN_WAIT_1 state. */ - struct uip_conn *tmp = g_active_tcp_connections.head; + FAR struct uip_conn *tmp = + (FAR struct uip_conn *)g_active_tcp_connections.head; + while (tmp) { nllvdbg("conn: %p state: %02x\n", tmp, tmp->tcpstateflags); @@ -252,7 +254,7 @@ struct uip_conn *uip_tcpalloc(void) /* Look at the next active connection */ - tmp = tmp->node.flink; + tmp = (FAR struct uip_conn *)tmp->node.flink; } /* Did we find a connection that we can re-use? */ diff --git a/tools/Config.mk b/tools/Config.mk index bddaa17dfe..1cb5296b55 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -2,7 +2,7 @@ # Config.mk # Global build rules and macros. # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. # Author: Richard Cochran # Gregory Nutt # @@ -152,6 +152,17 @@ define ASSEMBLE $(Q) $(CC) -c $(AFLAGS) $1 -o $2 endef +# MOVEOBJ - Default macro to move an object file to the correct location +# Example: $(call MOVEOBJ, prefix, directory) +# +# This is only used in directories that keep object files in sub-directories. +# Certain compilers (ZDS-II) always place the resulting files in the the +# directory where the compiler was invoked with not option to generate objects +# in a different location. + +define MOVEOBJ +endef + # ARCHIVE - Add a list of files to an archive # Example: $(call ARCHIVE, archive-file, "file1 file2 file3 ...") # @@ -204,6 +215,18 @@ define DELDIR endef endif +# MOVEFILE - Move one file + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) +define MOVEFILE + $(Q) if exist $1 (move /Y $1 $2) +endef +else +define MOVEFILE + $(Q) mv -f $1 $2 +endef +endif + # CLEAN - Default clean target ifeq ($(CONFIG_WINDOWS_NATIVE),y)