Changeset 35a1ec9 in rtems

Timestamp:

01/06/98 20:18:21 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

566aea7d

Parents:

2872e0b

Message:

Updates from Eric Norum. Changed CPU CFLAG and went to a common name
for the network driver attach entry point.

File:

• c/src/lib/libbsp/m68k/gen68360/network/network.c (modified) (11 diffs)

c/src/lib/libbsp/m68k/gen68360/network/network.c

@@ -31 +31 @@
  * since a single frame often uses four or more buffer descriptors.
  */
-#define RX_BD_COUNT     15
-#define TX_BD_COUNT     12
+#define RX_BUF_COUNT     15
+#define TX_BUF_COUNT     4
+#define TX_BD_PER_BUF    4
 
 /*
@@ -96 +97 @@
         if ((m360.scc1.sccm & 0x8) && (m360.scc1.scce & 0x8)) {
                 m360.scc1.scce = 0x8;
+                m360.scc1.sccm &= ~0x8;
                 m360EnetDriver[0].rxInterrupts++;
                 rtems_event_send (m360EnetDriver[0].iface->rxproc, INTERRUPT_EVENT);
@@ -105 +107 @@
         if ((m360.scc1.sccm & 0x12) && (m360.scc1.scce & 0x12)) {
                 m360.scc1.scce = 0x12;
+                m360.scc1.sccm &= ~0x12;
                 m360EnetDriver[0].txInterrupts++;
                 rtems_event_send (m360EnetDriver[0].txWaitTid, INTERRUPT_EVENT);
@@ -457 +460 @@
 
                         /*
-                         * Unmask TXB (buffer transmitted) and
-                         * TXE (transmitter error) events.
-                         */
-                        m360.scc1.sccm |= 0x12;
-
-                        /*
                          * Wait for buffer descriptor to become available.
                          * Note that the buffer descriptors are checked
@@ -469 +466 @@
                          * available between the `if' above, and the clearing
                          * of the event register.
-                         * Also, the event receive doesn't wait forever.
                          * This is to catch the case where the transmitter
                          * stops in the middle of a frame -- and only the
@@ -477 +473 @@
                         m360Enet_retire_tx_bd (dp);
                         while ((dp->txBdActiveCount + nAdded) == dp->txBdCount) {
+                                /*
+                                 * Unmask TXB (buffer transmitted) and
+                                 * TXE (transmitter error) events.
+                                 */
+                                m360.scc1.sccm |= 0x12;
+
                                 rtems_ka9q_event_receive (INTERRUPT_EVENT,
-                                        RTEMS_WAIT|RTEMS_EVENT_ANY,
-                                        1 + 1000000/BSP_Configuration.microseconds_per_tick);
+                                                RTEMS_WAIT|RTEMS_EVENT_ANY,
+                                                RTEMS_NO_TIMEOUT);
                                 m360Enet_retire_tx_bd (dp);
-                        }
-
-                        /*
-                         * Mask TXB and TXE events.
-                         * This eliminates the load of interupts happening
-                         * when the daemon is not interested.
-                         */
-                        {
-                        ISR_Level level;
-                        _ISR_Disable (level);
-                        m360.scc1.sccm &= ~0x12;
-                        m360.scc1.scce = 0x12;
-                        _ISR_Enable (level);
                         }
                 }
@@ -589 +578 @@
 
                         /*
-                         * Unmask RXF (Full frame received) event
-                         */
-                        m360.scc1.sccm |= 0x8;
-
-                        /*
                          * Wait for packet
                          * Note that the buffer descriptor is checked
@@ -601 +585 @@
                          */
                         while ((status = rxBd->status) & M360_BD_EMPTY) {
+                                /*
+                                 * Unmask RXF (Full frame received) event
+                                 */
+                                m360.scc1.sccm |= 0x8;
+
                                 rtems_ka9q_event_receive (INTERRUPT_EVENT,
                                                 RTEMS_WAIT|RTEMS_EVENT_ANY,
                                                 RTEMS_NO_TIMEOUT);
-                        }
-
-                        /*
-                         * Mask RXF (Full frame received) event
-                         * By doing so, we avoid the overhead of
-                         * receive interupts happening while the receive
-                         * daemon is busy elsewhere
-                         */
-                        {
-                        ISR_Level level;
-                        _ISR_Disable (level);
-                        m360.scc1.sccm &= ~0x8;
-                        m360.scc1.scce = 0x8;
-                        _ISR_Enable (level);
                         }
                 }
@@ -758 +733 @@
  * This is the only `extern' function in the driver.
  *
- * argv[0]: interface label, e.g., "m360scc1"
- * argv[1]: maximum transmission unit, bytes, e.g., "1500"
- * argv[2]: accept ("broadcast") or ignore ("nobroadcast") broadcast packets
- * Following arguments are optional, but if present, must appear in
- * the following order:
- * rxbdcount ##      -- Set number of receive buffer descriptors
- * txbdcount ##      -- Set number of transmit buffer descriptors
- * Following arguments are optional, but if Ethernet address is
- * specified, Internet address must also be specified. 
- * ###.###.###.###   -- IP address
- * ##:##:##:##:##:## -- Ethernet address
+ * argv[0]: interface label, e.g., "rtems"
+ * The remainder of the arguemnts are key/value pairs:
+ * mtu ##                  --  maximum transmission unit, default 1500
+ * broadcast y/n           -- accept or ignore broadcast packets, default yes
+ * rbuf ##                 -- Set number of receive buffer descriptors
+ * rbuf ##                 -- Set number of transmit buffer descriptors
+ * ip ###.###.###.###      -- IP address
+ * ether ##:##:##:##:##:## -- Ethernet address
+ * ether prom              -- Get Ethernet address from bootstrap PROM
  */
 int
-m360Enet_attach (int argc, char *argv[], void *p)
+rtems_ka9q_driver_attach (int argc, char *argv[], void *p)
 {
         struct iface *iface;
@@ -779 +752 @@
         int argIndex;
         int broadcastFlag;
+        char cbuf[30];
 
         /*
@@ -802 +776 @@
         iface = callocw (1, sizeof *iface);
         iface->name = strdup (argv[0]);
-        iface->mtu = atoi (argv[1]);
-
-        /*
-         * Select broadcast packet handling
-         */
-        cp = argv[2];
-        if (strnicmp (cp, "broadcast", strlen (cp)) == 0) {
-                broadcastFlag = 1;
-        }
-        else if (strnicmp (cp, "nobroadcast", strlen (cp)) == 0) {
-                broadcastFlag = 0;
-        }
-        else {
-                printf ("Argument `%s' is neither `broadcast' nor `nobroadcast'.\n", cp);
-                return -1;
-        }
-        argIndex = 3;
-
-        /*
-         * Set receive buffer descriptor count
-         */
-        dp->rxBdCount = RX_BD_COUNT;
-        if (argIndex < (argc - 1)) {
-                cp = argv[argIndex];
-                if (strnicmp (argv[argIndex], "rxbdcount", strlen (cp)) == 0) {
-                        dp->rxBdCount = atoi (argv[argIndex + 1]);
-                        argIndex += 2;
-                }
-        }
-                
-        /*
-         * Set transmit buffer descriptor count
-         */
+
+        /*
+         * Set default values
+         */
+        broadcastFlag = 1;
         dp->txWaitTid = 0;
-        dp->txBdCount = TX_BD_COUNT;
-        if (argIndex < (argc - 1)) {
-                cp = argv[argIndex];
-                if (strnicmp (argv[argIndex], "txbdcount", strlen (cp)) == 0) {
-                        dp->txBdCount = atoi (argv[argIndex + 1]);
-                        argIndex += 2;
-                }
-        }
-
-        /*
-         * Set Internet address
-         */
-        if (argIndex < argc)
-                iface->addr = resolve (argv[argIndex++]);
-        else
-                iface->addr = Ip_addr;
-
-        /*
-         * Set Ethernet address
-         */
+        dp->rxBdCount = RX_BUF_COUNT;
+        dp->txBdCount = TX_BUF_COUNT * TX_BD_PER_BUF;
+        iface->mtu = 1500;
+        iface->addr = Ip_addr;
         iface->hwaddr = mallocw (EADDR_LEN);
-        if (argIndex < argc) {
-                gether (iface->hwaddr, argv[argIndex++]);
-        }
-        else {
-                /*
-                 * The first 4 bytes of the bootstrap prom contain
-                 * the value loaded into the stack pointer as part
-                 * of the CPU32's hardware reset exception handler.
-                 * The following 4 bytes contain the value loaded
-                 * into the program counter.
-                 * The low order three octets of the boards' Ethernet
-                 * address are stored in the three bytes immediately
-                 * preceding this initial program counter value.
-                 *
-                 * See startup/linkcmds and start360/start360.s for
-                 * details on how this is done.
-                 *
-                 * The high order three octets of the Ethernet address
-                 * are fixed and indicate that the address is that
-                 * of a Motorola device.
-                 */
-                {
-                extern void *_RomBase;  /* Value provided by linkcmds script */
-                const unsigned long *ExceptionVectors;
-                const unsigned char *entryPoint;
-                char cbuf[30];
-
-                /*
-                 * Set up the fixed portion of the hardware address
-                 */
-                iface->hwaddr[0] = 0x08;
-                iface->hwaddr[1] = 0x00;
-                iface->hwaddr[2] = 0x3e;
-
-                /*
-                 * Sanity check -- assume entry point must be
-                 * within 1 MByte of beginning of boot ROM.
-                 */
-                ExceptionVectors = (const unsigned long *)&_RomBase;
-                entryPoint = (const unsigned char *)ExceptionVectors[1];
-                if (((unsigned long)entryPoint - (unsigned long)ExceptionVectors)
+        memset (iface->hwaddr, 0x08, EADDR_LEN);
+
+        /*
+         * Parse arguments
+         */
+        for (argIndex = 1 ; argIndex < (argc - 1) ; argIndex++) {
+                if (strcmp ("mtu", argv[argIndex]) == 0) {
+                        iface->mtu = atoi (argv[++argIndex]);
+                }
+                else if (strcmp ("broadcast", argv[argIndex]) == 0) {
+                        if (*argv[++argIndex] == 'n')
+                                broadcastFlag = 0;
+                }
+                else if (strcmp ("rbuf", argv[argIndex]) == 0) {
+                        dp->rxBdCount = atoi (argv[++argIndex]);
+                }
+                else if (strcmp ("tbuf", argv[argIndex]) == 0) {
+                        dp->txBdCount = atoi (argv[++argIndex]) * TX_BD_PER_BUF;
+                }
+                else if (strcmp ("ip", argv[argIndex]) == 0) {
+                        iface->addr = resolve (argv[++argIndex]);
+                }
+                else if (strcmp ("ether", argv[argIndex]) == 0) {
+                        argIndex++;
+                        if (strcmp (argv[argIndex], "prom") == 0) {
+                                /*
+                                 * The first 4 bytes of the bootstrap prom
+                                 * contain the value loaded into the stack
+                                 * pointer as part of the CPU32's hardware
+                                 * reset exception handler.  The following
+                                 * 4 bytes contain the value loaded into the
+                                 * program counter.  The low order three
+                                 * octets of the boards' Ethernet address are
+                                 * stored in the three bytes immediately
+                                 * preceding this initial program counter value.
+                                 *
+                                 * See startup/linkcmds and start360/start360.s
+                                 * for details on how this is done.
+                                 *
+                                 * The high order three octets of the Ethernet
+                                 * address are fixed and indicate that the
+                                 * address is that of a Motorola device.
+                                 */
+                                extern void *_RomBase;  /* From linkcmds */
+                                const unsigned long *ExceptionVectors;
+                                const unsigned char *entryPoint;
+
+                                /*
+                                 * Set up the fixed portion of the address
+                                 */
+                                iface->hwaddr[0] = 0x08;
+                                iface->hwaddr[1] = 0x00;
+                                iface->hwaddr[2] = 0x3e;
+
+                                /*
+                                 * Sanity check -- assume entry point must be
+                                 * within 1 MByte of beginning of boot ROM.
+                                 */
+                                ExceptionVectors = (const unsigned long *)&_RomBase;
+                                entryPoint = (const unsigned char *)ExceptionVectors[1];
+                                if (((unsigned long)entryPoint - (unsigned long)ExceptionVectors)
                                                         >= (1 * 1024 * 1024)) {
-                        printf ("Warning -- Ethernet address can not be found in bootstrap PROM.\n");
-                        iface->hwaddr[3] = 0x12;
-                        iface->hwaddr[4] = 0xE2;
-                        iface->hwaddr[5] = 0x05;
+                                        printf ("Warning -- Ethernet address can not be found in bootstrap PROM.\n");
+                                        iface->hwaddr[3] = 0xC2;
+                                        iface->hwaddr[4] = 0xE7;
+                                        iface->hwaddr[5] = 0x08;
+                                }
+                                else {
+                                        iface->hwaddr[3] = entryPoint[-3];
+                                        iface->hwaddr[4] = entryPoint[-2];
+                                        iface->hwaddr[5] = entryPoint[-1];
+                                }
+                        }
+                        else {
+                                gether (iface->hwaddr, argv[argIndex]);
+                        }
                 }
                 else {
-                        iface->hwaddr[3] = entryPoint[-3];
-                        iface->hwaddr[4] = entryPoint[-2];
-                        iface->hwaddr[5] = entryPoint[-1];
-                }
-                printf ("Ethernet address: %s\n", pether (cbuf, iface->hwaddr));
-                }
-        }
+                        printf ("Argument %d (%s) is invalid.\n", argIndex, argv[argIndex]);
+                        return -1;
+                }
+        }
+        printf ("Ethernet address: %s\n", pether (cbuf, iface->hwaddr));
+
+        /*
+         * Fill in remainder of interface configuration
+         */
         iface->dev = i;
         iface->raw = m360Enet_raw;