diff --git a/ChangeLog b/ChangeLog
index ce9c92235ecf23a93e948195cf02d57325c49dee..31d8d81d8cb7c3cc6a64cb1d7c642435a6141a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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).
+
diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs
index c8c776c750f6e9fc2348e02e290c66469dfb3f54..7e5b802603f90ed8d4062e186b4fc7af5fd793c3 100644
--- a/configs/ez80f910200kitg/ostest/Make.defs
+++ b/configs/ez80f910200kitg/ostest/Make.defs
@@ -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)}
diff --git a/configs/ez80f910200zco/dhcpd/Make.defs b/configs/ez80f910200zco/dhcpd/Make.defs
index abaa11feb5afcd2a21eb1b4e61c2dc75ef89d848..06b08c2e4f5cf714331acfe70409803dc2f21925 100644
--- a/configs/ez80f910200zco/dhcpd/Make.defs
+++ b/configs/ez80f910200zco/dhcpd/Make.defs
@@ -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)}
diff --git a/configs/ez80f910200zco/httpd/Make.defs b/configs/ez80f910200zco/httpd/Make.defs
index 8889c9b97e89d815a65211a8f48b5b7e1d385280..08979608a7085ac20faddac4efe026dc84d436c6 100644
--- a/configs/ez80f910200zco/httpd/Make.defs
+++ b/configs/ez80f910200zco/httpd/Make.defs
@@ -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)}
diff --git a/configs/ez80f910200zco/nettest/Make.defs b/configs/ez80f910200zco/nettest/Make.defs
index 17c15cc137cac4ea176ae9fe20a15f02929bb9fc..5111f8f05c356fc20a70e61caf2e928b9aae8b37 100644
--- a/configs/ez80f910200zco/nettest/Make.defs
+++ b/configs/ez80f910200zco/nettest/Make.defs
@@ -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)}
diff --git a/configs/ez80f910200zco/nsh/Make.defs b/configs/ez80f910200zco/nsh/Make.defs
index b4f731853268306b582d31506ccc2487b3447b87..1d935f781110f1ce39865e2fa51c3570f7003859 100644
--- a/configs/ez80f910200zco/nsh/Make.defs
+++ b/configs/ez80f910200zco/nsh/Make.defs
@@ -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)}
diff --git a/configs/ez80f910200zco/ostest/Make.defs b/configs/ez80f910200zco/ostest/Make.defs
index 92af420618c417fdd6fc38fcd27b921f4c207fbc..5fcc43c4b11a575923ad1cd23110179ace1da960 100644
--- a/configs/ez80f910200zco/ostest/Make.defs
+++ b/configs/ez80f910200zco/ostest/Make.defs
@@ -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)}
diff --git a/configs/ez80f910200zco/poll/Make.defs b/configs/ez80f910200zco/poll/Make.defs
index a1558e8e2e0533de02ca556ae92fbe05d816963a..ca7de28ca8c58ea899110e36a850bce45fe703c2 100644
--- a/configs/ez80f910200zco/poll/Make.defs
+++ b/configs/ez80f910200zco/poll/Make.defs
@@ -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)}
diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs
index 1eafbdf9e62689a82970122b57e47fefc66bfbc7..9b7ac4179e498cfddd3539b552d625cda6342d27 100644
--- a/configs/z16f2800100zcog/ostest/Make.defs
+++ b/configs/z16f2800100zcog/ostest/Make.defs
@@ -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)}
diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs
index 6f725da11ba348990ff09848bf475c6a98a94780..36c4f577256b11548932ef92df286755ae904a9b 100755
--- a/configs/z16f2800100zcog/pashello/Make.defs
+++ b/configs/z16f2800100zcog/pashello/Make.defs
@@ -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)}
diff --git a/configs/z8encore000zco/ostest/Make.defs b/configs/z8encore000zco/ostest/Make.defs
index 8e4e7e90b77bdf76c82fe155480cfa507aed4518..a14f9b61543c0cf4c156a8c5b372f42400a5ec8b 100644
--- a/configs/z8encore000zco/ostest/Make.defs
+++ b/configs/z8encore000zco/ostest/Make.defs
@@ -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)}
diff --git a/configs/z8f64200100kit/ostest/Make.defs b/configs/z8f64200100kit/ostest/Make.defs
index 3b82fba279116177213f137541186d090856241b..7324c79524fd1ab76fe113558b4f7e82f4948856 100644
--- a/configs/z8f64200100kit/ostest/Make.defs
+++ b/configs/z8f64200100kit/ostest/Make.defs
@@ -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)}
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index f1149df6dd103dcd183f23e2d4568595bc8e5385..9f1844762e3884a4666eb4bafa1ddcf5b01312f1 100755
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -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
};
diff --git a/fs/fs_fdopen.c b/fs/fs_fdopen.c
index 176ba1bf455db6d5d7d2f74381f5dd8db2fde627..930aec26fffcf86ecf6a3448695e6ec777bb1570 100644
--- a/fs/fs_fdopen.c
+++ b/fs/fs_fdopen.c
@@ -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 */
diff --git a/include/nuttx/mii.h b/include/nuttx/mii.h
index ea63b154b67670ae5c86425b6bfc70f898365cda..59458ec3f02064af4626a3ad0f378e9e135a458f 100644
--- a/include/nuttx/mii.h
+++ b/include/nuttx/mii.h
@@ -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
diff --git a/include/nuttx/net.h b/include/nuttx/net.h
index 1d514e888b8c0004651e0e32fc8380e0ef0c2d90..62dfa2bd8be886cdd788aff0c0f85b4550c43e61 100644
--- a/include/nuttx/net.h
+++ b/include/nuttx/net.h
@@ -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
diff --git a/net/net_checksd.c b/net/net_checksd.c
index 76d30fbee1b1e1892b31bc0155e55f4e155a1242..3da3cea62faf1eb65d2b839b7fb6067bfc7204e9 100644
--- a/net/net_checksd.c
+++ b/net/net_checksd.c
@@ -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 */