more cleanup

SVN-Revision: 6309

4 files changed, 47 insertions, 95 deletions

diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c b/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c
index 52009fe40d..34ba7527d4 100644
--- a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c
+++ b/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c
@@ -76,7 +76,6 @@
 #define BOARD_IDX_STATIC	0
 #define BOARD_IDX_OVERFLOW	-1
 
-#include "platform.h"
 #include "dma.h"
 #include "ar2313.h"
 
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.h b/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.h
index 40af4cb7f5..464aacae71 100644
--- a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.h
+++ b/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.h
@@ -4,7 +4,6 @@
 #include <linux/autoconf.h>
 #include <asm/bootinfo.h>
 #include <ar531x_platform.h>
-#include "platform.h"
 
 /*
  * probe link timer - 5 secs
@@ -48,14 +47,53 @@ static inline int tx_space (u32 csm, u32 prd)
 #define AR2313_SYNC		12
 
 
-struct ar2313_cmd {
-	u32	cmd;
-	u32     address;      /* virtual address of image */
-	u32     length;       /* size of image to download */
-	u32     mailbox;      /* mailbox to get/set */
-	u32     data[2];      /* contents of mailbox to read/write */
-};
-
+//
+// New Combo structure for Both Eth0 AND eth1
+//
+typedef struct {
+  volatile unsigned int mac_control;    /* 0x00 */
+  volatile unsigned int mac_addr[2];    /* 0x04 - 0x08*/
+  volatile unsigned int mcast_table[2]; /* 0x0c - 0x10 */
+  volatile unsigned int mii_addr;       /* 0x14 */
+  volatile unsigned int mii_data;       /* 0x18 */
+  volatile unsigned int flow_control;   /* 0x1c */
+  volatile unsigned int vlan_tag;       /* 0x20 */
+  volatile unsigned int pad[7];         /* 0x24 - 0x3c */
+  volatile unsigned int ucast_table[8]; /* 0x40-0x5c */
+  
+} ETHERNET_STRUCT;
+
+/********************************************************************
+ * Interrupt controller 
+ ********************************************************************/
+
+typedef struct {
+  volatile unsigned int wdog_control;		/* 0x08 */
+  volatile unsigned int wdog_timer;		/* 0x0c */
+  volatile unsigned int misc_status;		/* 0x10 */
+  volatile unsigned int misc_mask;		/* 0x14 */
+  volatile unsigned int global_status;		/* 0x18 */
+  volatile unsigned int reserved;		/* 0x1c */
+  volatile unsigned int reset_control;		/* 0x20 */
+} INTERRUPT;
+
+/********************************************************************
+ * DMA controller
+ ********************************************************************/
+typedef struct {
+  volatile unsigned int bus_mode;        /* 0x00 (CSR0) */
+  volatile unsigned int xmt_poll;        /* 0x04 (CSR1) */
+  volatile unsigned int rcv_poll;        /* 0x08 (CSR2) */
+  volatile unsigned int rcv_base;        /* 0x0c (CSR3) */
+  volatile unsigned int xmt_base;        /* 0x10 (CSR4) */
+  volatile unsigned int status;          /* 0x14 (CSR5) */
+  volatile unsigned int control;         /* 0x18 (CSR6) */
+  volatile unsigned int intr_ena;        /* 0x1c (CSR7) */
+  volatile unsigned int rcv_missed;      /* 0x20 (CSR8) */
+  volatile unsigned int reserved[11];    /* 0x24-0x4c (CSR9-19) */
+  volatile unsigned int cur_tx_buf_addr; /* 0x50 (CSR20) */
+  volatile unsigned int cur_rx_buf_addr; /* 0x50 (CSR21) */
+} DMA;
 
 /*
  * Struct private for the Sibyte.
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313_msg.h b/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313_msg.h
deleted file mode 100644
index d10d9eadee..0000000000
--- a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313_msg.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _AR2313_MSG_H_
-#define _AR2313_MSG_H_
-
-#define AR2313_MTU                     1692
-#define AR2313_PRIOS                   1
-#define AR2313_QUEUES                  (2*AR2313_PRIOS)
-
-#define AR2313_DESCR_ENTRIES           64
-
-typedef struct {
-    volatile unsigned int	status;		// OWN, Device control and status.
-    volatile unsigned int	devcs;		// pkt Control bits + Length
-    volatile unsigned int	addr;		// Current Address.
-    volatile unsigned int	descr;		// Next descriptor in chain.
-} ar2313_descr_t;
-
-#endif /* _AR2313_MSG_H_ */
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/platform.h b/target/linux/atheros-2.6/files/drivers/net/ar2313/platform.h
deleted file mode 100644
index 8e1c565bbd..0000000000
--- a/target/linux/atheros-2.6/files/drivers/net/ar2313/platform.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/********************************************************************************
-   Title:   $Source: platform.h,v $
-
-   Author:  Dan Steinberg
-            Copyright Integrated Device Technology 2001
-
-   Purpose: AR2313 Register/Bit Definitions
-   
-   Update:
-            $Log: platform.h,v $
-      
-   Notes:   See Merlot architecture spec for complete details.  Note, all
-            addresses are virtual addresses in kseg1 (Uncached, Unmapped).
- 
-********************************************************************************/
-
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-//
-// New Combo structure for Both Eth0 AND eth1
-//
-typedef struct {
-  volatile unsigned int mac_control;    /* 0x00 */
-  volatile unsigned int mac_addr[2];    /* 0x04 - 0x08*/
-  volatile unsigned int mcast_table[2]; /* 0x0c - 0x10 */
-  volatile unsigned int mii_addr;       /* 0x14 */
-  volatile unsigned int mii_data;       /* 0x18 */
-  volatile unsigned int flow_control;   /* 0x1c */
-  volatile unsigned int vlan_tag;       /* 0x20 */
-  volatile unsigned int pad[7];         /* 0x24 - 0x3c */
-  volatile unsigned int ucast_table[8]; /* 0x40-0x5c */
-  
-} ETHERNET_STRUCT;
-
-/********************************************************************
- * Interrupt controller 
- ********************************************************************/
-
-typedef struct {
-  volatile unsigned int wdog_control;		/* 0x08 */
-  volatile unsigned int wdog_timer;		/* 0x0c */
-  volatile unsigned int misc_status;		/* 0x10 */
-  volatile unsigned int misc_mask;		/* 0x14 */
-  volatile unsigned int global_status;		/* 0x18 */
-  volatile unsigned int reserved;		/* 0x1c */
-  volatile unsigned int reset_control;		/* 0x20 */
-} INTERRUPT;
-
-/********************************************************************
- * DMA controller
- ********************************************************************/
-typedef struct {
-  volatile unsigned int bus_mode;        /* 0x00 (CSR0) */
-  volatile unsigned int xmt_poll;        /* 0x04 (CSR1) */
-  volatile unsigned int rcv_poll;        /* 0x08 (CSR2) */
-  volatile unsigned int rcv_base;        /* 0x0c (CSR3) */
-  volatile unsigned int xmt_base;        /* 0x10 (CSR4) */
-  volatile unsigned int status;          /* 0x14 (CSR5) */
-  volatile unsigned int control;         /* 0x18 (CSR6) */
-  volatile unsigned int intr_ena;        /* 0x1c (CSR7) */
-  volatile unsigned int rcv_missed;      /* 0x20 (CSR8) */
-  volatile unsigned int reserved[11];    /* 0x24-0x4c (CSR9-19) */
-  volatile unsigned int cur_tx_buf_addr; /* 0x50 (CSR20) */
-  volatile unsigned int cur_rx_buf_addr; /* 0x50 (CSR21) */
-} DMA;
-
-#endif /* PLATFORM_H */