Ticket #1590: if_bge.fix.diff

if_bge.

@@ -378 +384 @@
 static int bge_has_eaddr(struct bge_softc *);
 static uint32_t bge_readmem_ind(struct bge_softc *, int);
 static void bge_writemem_ind(struct bge_softc *, int, int);
-static void bge_writembx(struct bge_softc *, int, int);
+//used in glue.c
+void bge_writembx(struct bge_softc *, int, int);
 #ifdef notdef
 static uint32_t bge_readreg_ind(struct bge_softc *, int);
 #endif
@@ -553 +559 @@
     CSR_WRITE_4(sc, off, val);
 }
 
-static void
+void
 bge_writembx(struct bge_softc *sc, int off, int val)
 {
     if (sc->bge_asicrev == BGE_ASICREV_BCM5906)
@@ -2358 +2364 @@
     u_char eaddr[ETHER_ADDR_LEN];
     int error, reg, rid, trys;
 
     sc = device_get_softc(dev);
     sc->bge_dev = dev;
+    sc->transmitting = 0;
 
     /*
      * Map control/status registers.
 
@@ -3315 +3332 @@
      * the status check).  So toggling would probably be a pessimization
      * even with MSI.  It would only be needed for using a task queue.
      */
+#ifndef __HAIKU__
     bge_writembx(sc, BGE_MBX_IRQ0_LO, 0);
+#endif
 
     /*
      * Do the mandatory PCI flush as well as get the link status.
      */
-    statusword = CSR_READ_4(sc, BGE_MAC_STS) & BGE_MACSTAT_LINK_CHANGED;
+#ifndef __HAIKU__ 
+        statusword = CSR_READ_4(sc, BGE_MAC_STS) & BGE_MACSTAT_LINK_CHANGED; 
+#else 
+        /* Get the statusword as saved in __haiku_disable_interrupts 
+         * and clear the saved value */ 
+        statusword = atomic_and((int32 *)&sc->bge_intr_status, 0) & BGE_MACSTAT_LINK_CHANGED; 
+#endif 
 
     /* Make sure the descriptor ring indexes are coherent. */
     bus_dmamap_sync(sc->bge_cdata.bge_status_tag,
@@ -3328 +3355 @@
     bus_dmamap_sync(sc->bge_cdata.bge_status_tag,
         sc->bge_cdata.bge_status_map, BUS_DMASYNC_PREREAD);
 
+        /* TODO: bge_link_upd is probably not correct with interrupt changes 
+         * May need to also use the saved statusword... */ 
     if ((sc->bge_asicrev == BGE_ASICREV_BCM5700 &&
         sc->bge_chipid != BGE_CHIPID_BCM5700_B2) ||
         statusword || sc->bge_link_evt)
@@ -3541 +3570 @@
     error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, m, segs,
         &nsegs, BUS_DMA_NOWAIT);
     if (error == EFBIG) {
-        m = m_collapse(m, M_DONTWAIT, BGE_NSEG_NEW);
+        //m = m_collapse(m, M_DONTWAIT, BGE_NSEG_NEW);
+        panic("m_collapse not implemented");
         if (m == NULL) {
             m_freem(*m_head);
             *m_head = NULL;
@@ -3631 +3661 @@
     uint32_t prodidx;
     int count = 0;
 
     sc = ifp->if_softc;
 
-    if (!sc->bge_link || IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+    if (IFQ_DRV_IS_EMPTY(&ifp->if_snd))
         return;
 
     prodidx = sc->bge_tx_prodidx;
 
     while(sc->bge_cdata.bge_tx_chain[prodidx] == NULL) {
@@ -3695 +3730 @@
         /* No packets were dequeued. */
         return;
 
+    sc -> transmitting = 1;
     /* Transmit. */
     bge_writembx(sc, BGE_MBX_TX_HOST_PROD0_LO, prodidx);
     /* 5700 b2 errata */
@@ -4252 +4291 @@
          */
         if (mii != NULL) {
             ifm = mii->mii_media.ifm_cur;
+            if (ifm == NULL)
+            {
+                panic("bge_stop: ifm == NULL");
+                return ;
+            }
             mtmp = ifm->ifm_media;
             ifm->ifm_media = IFM_ETHER | IFM_NONE;
             mii_mediachg(mii);