Ticket #1590: if_bge.diff

add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/glue.c

@@ -5 +5 @@
 
 
 #include <sys/bus.h>
+#include "if_bgereg.h"
 
 
 HAIKU_FBSD_DRIVER_GLUE(broadcom_bcm570x, bge, pci);
@@ -25 +26 @@
     return __haiku_probe_miibus(dev, drivers);
 }
 
+int
+__haiku_disable_interrupts(device_t dev)
+{
+    // Honestly, I don't know if this is correct. 
+    // I just copied it from if_bge searching for disable interrupts
+    struct bge_softc *sc = device_get_softc(dev);
+    BGE_SETBIT(sc, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_MASK_PCI_INTR);
+    CSR_WRITE_4(sc, BGE_MBX_IRQ0_LO, 1);
+
+    // TODO: should we check if this succeeded and return appropriately?
+    return 1;
+}
+
+
+void
+__haiku_reenable_interrupts(device_t dev)
+{
+    // Honestly, I don't know if this is correct. 
+    // I just copied it from if_bge searching for enable interrupts
+    struct bge_softc *sc = device_get_softc(dev);
+    BGE_CLRBIT(sc, BGE_PCI_MISC_CTL, BGE_PCIMISCCTL_MASK_PCI_INTR);
+    CSR_WRITE_4(sc, BGE_MBX_IRQ0_LO, 0);
+}

libs/compat/freebsd_network/compat/sys/mbuf.h

@@ -82 +82 @@
 
 #define M_BCAST         0x00000200
 #define M_MCAST         0x00000400
+#define M_FRAG          0x00000800
+#define M_FIRSTFRAG     0x00001000
+#define M_LASTFRAG      0x00002000
 #define M_VLANTAG       0x00010000
 
 #define CSUM_IP         0x0001
@@ -124 +127 @@
 struct mbuf *m_get(int how, short type);
 struct mbuf *m_gethdr(int how, short type);
 void m_clget(struct mbuf *m, int how);
+void * m_cljget(struct mbuf *m, int how, int size);
 
 void m_extadd(struct mbuf *m, caddr_t buffer, u_int size,
     void (*freeHook)(void *, void *), void *args, int flags, int type);

libs/compat/freebsd_network/mbuf.c

@@ -150 +150 @@
     construct_ext_mbuf(m, how);
 }
 
+/*
+ * Comment from the freebsd (mbuf.h):
+ * m_cljget() is different from m_clget() as it can allocate clusters without
+ * attaching them to an mbuf.  In that case the return value is the pointer
+ * to the cluster of the requested size.  If an mbuf was specified, it gets
+ * the cluster attached to it and the return value can be safely ignored.
+ * For size it takes MCLBYTES, MJUMPAGESIZE, MJUM9BYTES, MJUM16BYTES.
+ */
+void *
+m_cljget(struct mbuf *m, int how, int size)
+{
+    // TODO: implement this
+    panic("m_cljget not yet implemented");
+    return (void *) NULL;
 
+/*
+//  This is the freebsd code
+    uma_zone_t zone;
+
+    if (m && m->m_flags & M_EXT)
+        printf("%s: %p mbuf already has cluster\n", __func__, m);
+    if (m != NULL)
+        m->m_ext.ext_buf = NULL;
+
+    zone = m_getzone(size);
+    return (uma_zalloc_arg(zone, m, how));
+*/
+}
+
+
 void
 m_freem(struct mbuf *mb)
 {