Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-21 04:52:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changes for clean ez80 ZDS-II compile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3733 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-06-22 15:22:56 +00:00
parent edc31bb66f
commit b47cd866a7
17 changed files with 82 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1830,3 +1830,8 @@
is only 16-bits.
6.6 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* drivers/mtd/ramtron.c, net/net_checksd.c, fs/fs_fdopen.c, and include/nuttx/mii.h:
Several structural changes made to get a clean compile under the ez80 ZDS-II
toolchain (no design changes).
configs/ez80f910200kitg/ostest/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/ez80f910200zco/dhcpd/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/ez80f910200zco/httpd/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/ez80f910200zco/nettest/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/ez80f910200zco/nsh/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/ez80f910200zco/ostest/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/ez80f910200zco/poll/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/z16f2800100zcog/ostest/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZNeo-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/z16f2800100zcog/pashello/Make.defs
+1
View File
@@ -48,6 +48,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZNeo-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/z8encore000zco/ostest/Make.defs
+1
View File
@@ -53,6 +53,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
configs/z8f64200100kit/ostest/Make.defs
+1
View File
@@ -53,6 +53,7 @@ ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog
# These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler
WINTOOL := y
WTOPDIR := ${shell cygpath -w $(TOPDIR)}
WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)}
WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)}
drivers/mtd/ramtron.c
+50 -44
View File
@@ -127,7 +127,8 @@
struct ramtron_parts_s
{
const char *name;
uint8_t id1, id2;
uint8_t id1;
uint8_t id2;
uint32_t size;
uint8_t addr_len;
uint32_t speed;
@@ -160,64 +161,69 @@ struct ramtron_dev_s
static struct ramtron_parts_s ramtron_parts[] =
{
{
.size = 32L*1024L,
.addr_len = 2,
.id1 = 0x22,
.id2 = 0x00,
.speed = 40000000,
.name = "FM25V02",
"FM25V02", /* name */
0x22, /* id1 */
0x00, /* id2 */
32L*1024L, /* size */
2, /* addr_len */
40000000 /* speed */
},
{
.size = 32L*1024L,
.addr_len = 2,
.id1 = 0x22,
.id2 = 0x01,
.speed = 40000000,
.name = "FM25VN02",
"FM25VN02", /* name */
0x22, /* id1 */
0x01, /* id2 */
32L*1024L, /* size */
2, /* addr_len */
40000000 /* speed */
},
{
.size = 64L*1024L,
.addr_len = 2,
.id1 = 0x23,
.id2 = 0x00,
.speed = 40000000,
.name = "FM25V05",
"FM25V05", /* name */
0x23, /* id1 */
0x00, /* id2 */
64L*1024L, /* size */
2, /* addr_len */
40000000 /* speed */
},
{
.size = 64L*1024L,
.addr_len = 2,
.id1 = 0x23,
.id2 = 0x01,
.speed = 40000000,
.name = "FM25VN05",
"FM25VN05", /* name */
0x23, /* id1 */
0x01, /* id2 */
64L*1024L, /* size */
2, /* addr_len */
40000000 /* speed */
},
{
.size = 128L*1024L,
.addr_len = 3,
.id1 = 0x24,
.id2 = 0x00,
.speed = 40000000,
.name = "FM25V10",
"FM25V10", /* name */
0x24, /* id1 */
0x00, /* id2 */
128L*1024L, /* size */
3, /* addr_len */
40000000 /* speed */
},
{
.size = 128L*1024L,
.addr_len = 3,
.id1 = 0x24,
.id2 = 0x01,
.speed = 40000000,
.name = "FM25VN10",
"FM25VN10", /* name */
0x24, /* id1 */
0x01, /* id2 */
128L*1024L, /* size */
3, /* addr_len */
40000000 /* speed */
},
#ifdef CONFIG_RAMTRON_FRAM_NON_JEDEC
{
.size = 256L*1024L,
.addr_len = 3,
.id1 = 0xff,
.id2 = 0xff,
.speed = 40000000,
.name = "FM25H20",
"FM25H20", /* name */
0xff, /* id1 */
0xff, /* id2 */
256L*1024L, /* size */
3, /* addr_len */
40000000 /* speed */
},
{
.name = NULL,
NULL, /* name */
0, /* id1 */
0, /* id2 */
0, /* size */
0, /* addr_len */
0 /* speed */
}
#endif
};
fs/fs_fdopen.c
+1 -1
View File
@@ -159,7 +159,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR _TCB *tcb)
*/
#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
ret = net_checksd(tcb, fd, oflags);
ret = net_checksd(fd, oflags);
#else
/* No networking... it is just a bad descriptor */
include/nuttx/mii.h
+12 -12
View File
@@ -396,15 +396,15 @@
#define KS8721_INTCS_REMFAULTE (1 << 9) /* Bit 9: Enable remote fault interrupt */
#define KS8721_INTCS_LINKDOWNE (1 << 10) /* Bit 10: Enable link down interrupt */
#define KS8721_INTCS_LPACKE (1 << 11) /* Bit 11: Enable link partner acknowldgement interrupt */
#define KS8721_INTCS_PDFAULT (1 << 12) /* Bit 12: Enable parallel detect fault interrupt */
#define KS8721_INTCS_PDFAULTE (1 << 12) /* Bit 12: Enable parallel detect fault interrupt */
#define KS8721_INTCS_PGRCVDE (1 << 13) /* Bit 13: Enable page received interrupt */
#define KS8721_INTCS_RXERRE (1 << 14) /* Bit 14: Enable receive error interrupt */
#define KS8721_INTCS_JABBERE (1 << 15) /* Bit 15: Enable Jabber Interrupt */
/* KS8921 10BASE-TX PHY control register */
#define KS8721_10BTCR_ xxx (1 << 0) /* Bit 0: xxx */
#define KS8721_10BTCR_ xxx (1 << 1) /* Bit 1: xxx */
#define KS8721_10BTCR_BIT0 (1 << 0) /* Bit 0: xxx */
#define KS8721_10BTCR_BIT1 (1 << 1) /* Bit 1: xxx */
#define KS8721_10BTCR_MODE_SHIFT (2) /* Bits 2-4: Operation Mode Indication */
#define KS8721_10BTCR_MODE_MASK (7 << KS8721_10BTCR_MODE_SHIFT)
# define KS8721_10BTCR_MODE_ANEG (0 << KS8721_10BTCR_MODE_SHIFT) /* Still in auto-negotiation */
@@ -414,15 +414,15 @@
# define KS8721_10BTCR_MODE_10BTFD (5 << KS8721_10BTCR_MODE_SHIFT) /* 10BASE-T full duplex */
# define KS8721_10BTCR_MODE_100BTFD (6 << KS8721_10BTCR_MODE_SHIFT) /* 100BASE-T full duplex */
# define KS8721_10BTCR_MODE_ISOLATE (7 << KS8721_10BTCR_MODE_SHIFT) /* PHY/MII isolate */
#define KS8721_10BTCR_ ISOLATE (1 << 5) /* Bit 5: PHY isolate */
#define KS8721_10BTCR_ PAUSE (1 << 6) /* Bit 6: Enable pause */
#define KS8721_10BTCR_ ANEGCOMP (1 << 7) /* Bit 7: Auto-negotiation complete */
#define KS8721_10BTCR_ JABBERE (1 << 8) /* Bit 8: Enable Jabber */
#define KS8721_10BTCR_ INTLVL (1 << 9) /* Bit 9: Interrupt level */
#define KS8721_10BTCR_ POWER (1 << 10) /* Bit 10: Power saving */
#define KS8721_10BTCR_ FORCE (1 << 11) /* Bit 11: Force link */
#define KS8721_10BTCR_ ENERGY (1 << 12) /* Bit 12: Energy detect */
#define KS8721_10BTCR_ PAIRSWAPD (1 << 13) /* Bit 13: Pairswap disable */
#define KS8721_10BTCR_ISOLATE (1 << 5) /* Bit 5: PHY isolate */
#define KS8721_10BTCR_PAUSE (1 << 6) /* Bit 6: Enable pause */
#define KS8721_10BTCR_ANEGCOMP (1 << 7) /* Bit 7: Auto-negotiation complete */
#define KS8721_10BTCR_JABBERE (1 << 8) /* Bit 8: Enable Jabber */
#define KS8721_10BTCR_INTLVL (1 << 9) /* Bit 9: Interrupt level */
#define KS8721_10BTCR_POWER (1 << 10) /* Bit 10: Power saving */
#define KS8721_10BTCR_FORCE (1 << 11) /* Bit 11: Force link */
#define KS8721_10BTCR_ENERGY (1 << 12) /* Bit 12: Energy detect */
#define KS8721_10BTCR_PAIRSWAPD (1 << 13) /* Bit 13: Pairswap disable */
/****************************************************************************
* Type Definitions
include/nuttx/net.h
+1 -2
View File
@@ -136,8 +136,7 @@ extern "C" {
* supports the requested access.
*/
typedef struct _TCB _TCB; /* Forward reference */
EXTERN int net_checksd(FAR _TCB *tcb, int fd, int oflags);
EXTERN int net_checksd(int fd, int oflags);
/* net_sockets.c *************************************************************/
/* There interfaces are called only from OS scheduling and iniialization logic
net/net_checksd.c
+2 -2
View File
@@ -64,7 +64,7 @@
****************************************************************************/
#if defined(CONFIG_NET) && CONFIG_NFILE_DESCRIPTORS > 0
int net_checksd(FAR _TCB *tcb, int sd, int oflags)
int net_checksd(int sd, int oflags)
{
FAR struct socket *psock = sockfd_socket(sd);
@@ -84,5 +84,5 @@ int net_checksd(FAR _TCB *tcb, int sd, int oflags)
return OK;
}
#endif /* CONIG_NET && ONFIG_NFILE_DESCRIPTORS > 0 */
#endif /* CONIG_NET && CONFIG_NFILE_DESCRIPTORS > 0 */