Changeset 3ffa814 in rtems

Timestamp:

Oct 5, 2005, 7:29:23 PM (16 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

59d5575

Parents:

774515b

Message:

2005-10-05 Jiri Gaisler <jiri@…>

Edvin Catovic <edvin@…>
Konrad Eisele <konrad@…>

PR 827/bsps

• network/Makefile.am, network/open_eth.c, network/open_eth.h: Portion of large update of SPARC BSPs. Includes addition of sis, leon2 and leon3 BSPs, deletion of leon BSP, addition of SMC91111 NIC driver and much more.
• network/README.smc91111, network/smc91111.c, network/smc91111.h, network/smc91111config.h, network/smc91111exp.h: New files.

Location:

c/src/libchip

Files:

• ChangeLog (modified) (1 diff)
• network/Makefile.am (modified) (2 diffs)
• network/README.smc91111 (added)
• network/open_eth.c (modified) (6 diffs)
• network/open_eth.h (modified) (1 diff)
• network/smc91111.c (added)
• network/smc91111.h (added)
• network/smc91111config.h (added)
• network/smc91111exp.h (added)

c/src/libchip/ChangeLog

@@ +1 @@
+2005-10-05  Jiri Gaisler <jiri@gaisler.com>
+            Edvin Catovic <edvin@gaisler.com>
+            Konrad Eisele <konrad@gaisler.com>
+
+        PR 827/bsps
+        * network/Makefile.am, network/open_eth.c, network/open_eth.h: Portion
+        of large update of SPARC BSPs. Includes addition of sis, leon2 and
+        leon3 BSPs, deletion of leon BSP, addition of SMC91111 NIC driver and
+        much more.
+        * network/README.smc91111, network/smc91111.c, network/smc91111.h,
+        network/smc91111config.h, network/smc91111exp.h: New files.
+
 2005-04-28      Jennifer Averett <jennifer.averett@oarcorp.com>
 

c/src/libchip/network/Makefile.am

@@ -9 +9 @@
 LIB = $(ARCH)/$(LIBNAME).a
 
-C_FILES = cs8900.c dec21140.c i82586.c sonic.c if_fxp.c elnk.c open_eth.c
+C_FILES = cs8900.c dec21140.c i82586.c sonic.c if_fxp.c elnk.c open_eth.c \
+          smc91111.c 
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 include_libchip_HEADERS = cs8900.h i82586var.h if_fxpvar.h sonic.h if_media.h \
-    mii.h open_eth.h
+    mii.h open_eth.h smc91111.h smc91111exp.h
 
 include $(top_srcdir)/../../../automake/compile.am
@@ -50 +51 @@
 EXTRA_DIST = README README.cs8900 README.dec21140 README.i82586 \
     README.open_eth README.sonic cs8900.c cs8900.c.bsp dec21140.c \
-    i82586.c if_fxp.c open_eth.c sonic.c
+    i82586.c if_fxp.c open_eth.c sonic.c \
+    smc91111.c 
 
 include $(top_srcdir)/../../../automake/local.am

c/src/libchip/network/open_eth.c

@@ -7 +7 @@
  *  The license and distribution terms for this file may be
  *  found in found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
+ *  http://www.OARcorp.com/rtems/license.html.
  *
  */
@@ -89 +89 @@
 #define OETH_SUSPEND_NOTXBUF
  */
-
-#define OETH_RATE_10MHZ
 
 #if (MCLBYTES < RBUF_SIZE)
@@ -117 +115 @@
     struct MDRX *rxdesc;
     rtems_vector_number vector;
+    unsigned int en100MHz;
 
 
@@ -219 +218 @@
 
     /* reset PHY and wait for complettion */
-    mii_cr = read_mii(0);
-    mii_cr = 0x3320;
-#ifdef OETH_RATE_10MHZ
-    mii_cr = 0;
-#endif
+    /*
+    */
+    mii_cr = 0x3300;
+    if (!sc->en100MHz) mii_cr = 0;
     write_mii(0, mii_cr | 0x8000); 
     while (read_mii(0) & 0x8000) {}
-    write_mii(20, 0x1422);
-#ifdef OETH_RATE_10MHZ
-    mii_cr = 0;
-#endif
-    write_mii(0, mii_cr); 
+    if (!sc->en100MHz) write_mii(0, 0); 
+    mii_cr = read_mii(0);
     printf("open_eth: driver attached, PHY config : 0x%04x\n", read_mii(0));
 
@@ -484 +479 @@
 
       /* write buffer descriptor length and status */
+      len_status &= 0x0000ffff;
       len_status |= (len << 16) | (OETH_TX_BD_READY | OETH_TX_BD_CRC);
       dp->regs->xd[dp->tx_ptr].len_status = len_status;
@@ -710 +706 @@
     sc->txbufs = chip->txd_count;
     sc->rxbufs = chip->rxd_count;
+    sc->en100MHz = chip->en100MHz;
 
 

c/src/libchip/network/open_eth.h

@@ -13 +13 @@
   unsigned32              txd_count;
   unsigned32              rxd_count;
+  unsigned32              en100MHz;
 } open_eth_configuration_t;