another checkpoint commit. No longer builds.
authorRon Minnich <rminnich@gmail.com>
Thu, 8 Jan 2015 21:07:35 +0000 (13:07 -0800)
committerBarret Rhoden <brho@cs.berkeley.edu>
Tue, 3 Feb 2015 15:12:26 +0000 (10:12 -0500)
Signed-off-by: Ron Minnich <rminnich@gmail.com>
kern/drivers/net/bxe/Kbuild
kern/drivers/net/bxe/bxe_debug.c

index 7b8ab7f..1e4e226 100644 (file)
@@ -2,7 +2,7 @@ obj-y                                           += 57710_init_values.o
 obj-y                                           += 57711_init_values.o
 obj-y                                           += 57712_init_values.o
 #obj-y                                           += bxe.o
-#obj-y                                           += bxe_debug.o
+obj-y                                           += bxe_debug.o
 obj-y                                           += bxe_elink.o
 #obj-y                                           += bxe_stats.o
 #obj-y                                           += ecore_sp.o
index 24bc45b..e541209 100644 (file)
 
 #include "bxe.h"
 
-#include "ddb/ddb.h"
-#include "ddb/db_sym.h"
-#include "ddb/db_lex.h"
-
 #ifdef BXE_REG_NO_INLINE
 
 /*
@@ -43,10 +39,7 @@ void
 bxe_reg_write8(struct bxe_adapter *sc, bus_size_t offset, uint8_t val)
 {
     BLOGD(sc, DBG_REGS, "offset=0x%08lx val=0x%02x\n", offset, val);
-    bus_space_write_1(sc->bar[BAR0].tag,
-                      sc->bar[BAR0].handle,
-                      offset,
-                      val);
+    outb(sc->bar[BAR0].mmio_base64 + offset, val);
 }
 
 void
@@ -57,10 +50,7 @@ bxe_reg_write16(struct bxe_adapter *sc, bus_size_t offset, uint16_t val)
     }
 
     BLOGD(sc, DBG_REGS, "offset=0x%08lx val=0x%04x\n", offset, val);
-    bus_space_write_2(sc->bar[BAR0].tag,
-                      sc->bar[BAR0].handle,
-                      offset,
-                      val);
+    outw(sc->bar[BAR0].mmio_base64 + offset, val);
 }
 
 void
@@ -71,10 +61,7 @@ bxe_reg_write32(struct bxe_adapter *sc, bus_size_t offset, uint32_t val)
     }
 
     BLOGD(sc, DBG_REGS, "offset=0x%08lx val=0x%08x\n", offset, val);
-    bus_space_write_4(sc->bar[BAR0].tag,
-                      sc->bar[BAR0].handle,
-                      offset,
-                      val);
+    outl(sc->bar[BAR0].mmio_base64+offset, val);
 }
 
 uint8_t
@@ -82,9 +69,8 @@ bxe_reg_read8(struct bxe_adapter *sc, bus_size_t offset)
 {
     uint8_t val;
 
-    val = bus_space_read_1(sc->bar[BAR0].tag,
-                           sc->bar[BAR0].handle,
-                           offset);
+    val = inb(
+                           sc->bar[BAR0].mmio_base64  + offset);
     BLOGD(sc, DBG_REGS, "offset=0x%08lx val=0x%02x\n", offset, val);
 
     return (val);
@@ -99,9 +85,7 @@ bxe_reg_read16(struct bxe_adapter *sc, bus_size_t offset)
         BLOGD(sc, DBG_REGS, "Unaligned 16-bit read from 0x%08lx\n", offset);
     }
 
-    val = bus_space_read_2(sc->bar[BAR0].tag,
-                           sc->bar[BAR0].handle,
-                           offset);
+    val = inw(sc->bar[BAR0].mmio_base64 + offset);
     BLOGD(sc, DBG_REGS, "offset=0x%08lx val=0x%08x\n", offset, val);
 
     return (val);
@@ -116,9 +100,8 @@ bxe_reg_read32(struct bxe_adapter *sc, bus_size_t offset)
         BLOGD(sc, DBG_REGS, "Unaligned 32-bit read from 0x%08lx\n", offset);
     }
 
-    val = bus_space_read_4(sc->bar[BAR0].tag,
-                           sc->bar[BAR0].handle,
-                           offset);
+    val = inl(
+                           sc->bar[BAR0].mmio_base64 + offset);
     BLOGD(sc, DBG_REGS, "offset=0x%08lx val=0x%08x\n", offset, val);
 
     return (val);