phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Changes for ZDS-II ez80 build

This commit is contained in:
Gregory Nutt 2013-11-28 17:47:03 -06:00
parent 886829ab35
commit fdc526e875
27 changed files with 177 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nuttx/configs/ez80f910200kitg/ostest/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

8
nuttx/configs/ez80f910200zco/dhcpd/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

8
nuttx/configs/ez80f910200zco/httpd/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

8
nuttx/configs/ez80f910200zco/nettest/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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

8
nuttx/configs/ez80f910200zco/nsh/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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"; \

8
nuttx/configs/ez80f910200zco/ostest/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

8
nuttx/configs/ez80f910200zco/poll/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

3
nuttx/configs/olimex-lpc-h3131/README.txt
View File

@ -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

2
nuttx/configs/sama5d3x-ek/README.txt
View File

@ -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

8
nuttx/configs/z16f2800100zcog/ostest/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

8
nuttx/configs/z16f2800100zcog/pashello/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

8
nuttx/configs/z8encore000zco/ostest/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

8
nuttx/configs/z8f64200100kit/ostest/Make.defs
View File

@ -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 <gnutt@nuttx.org>
#
# 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 )

43
nuttx/include/nuttx/net/mii.h
View File

@ -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 */

8
nuttx/libc/.gitignore vendored
View File

@ -2,11 +2,5 @@
/Make_ubin.dep
/Make_kbin.dep
/.depend
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

2
nuttx/libc/Makefile
View File

@ -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

8
nuttx/libc/bin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

8
nuttx/libc/kbin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

8
nuttx/libc/ubin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

8
nuttx/mm/.gitignore vendored
View File

@ -2,11 +2,5 @@
/Make_ubin.dep
/Make_kbin.dep
/.depend
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

2
nuttx/mm/Makefile
View File

@ -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

8
nuttx/mm/bin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

8
nuttx/mm/kbin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

8
nuttx/mm/ubin/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

4
nuttx/net/net_close.c
View File

@ -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 */

6
nuttx/net/uip/uip_tcpconn.c
View File

@ -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? */

25
nuttx/tools/Config.mk
View File

@ -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 <gnutt@nuttx.org>
#
@ -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)