]> Zhao Yanbai Git Server - minix.git/commitdiff
Drivers: fix issues introduced by commit b198207
authorDavid van Moolenbroek <david@minix3.org>
Fri, 4 Nov 2011 22:54:02 +0000 (23:54 +0100)
committerDavid van Moolenbroek <david@minix3.org>
Fri, 4 Nov 2011 22:54:04 +0000 (23:54 +0100)
drivers/ahci/ahci.c
drivers/dp8390/rtl8029.c
drivers/fxp/fxp.c
drivers/lance/lance.c
drivers/rtl8139/rtl8139.c
drivers/ti1225/ti1225.c

index 09bffce4cffcf12f6dc48b2c7a5698e1626a4fc1..bb22674110c567425220cd0717a35817a6d85935 100644 (file)
 #include <minix/drivers.h>
 #include <minix/driver_mt.h>
 #include <minix/drvlib.h>
-#include <minix/u64.h>
 #include <machine/pci.h>
 #include <sys/ioc_disk.h>
 #include <sys/mman.h>
index 6741cd25a0e68d34309a1cc7f0ce19f4ed387358..b0895a372ca11965ea9e506b7a0a14ccfe9d7b12 100644 (file)
@@ -193,7 +193,7 @@ dpeth_t *dep;
 #endif
        }
 
-#if DEBUG
+#if 0
        for (i= 0; i<64; i++)
                printf("%x ", get_ee_word(dep, i));
        printf("\n");
index dbe8b61683c2d5e8ad4756f6cffc25745e47edfa..96f5f2aef5bd07e98e9589212d7a64908cb1bac3 100644 (file)
@@ -632,6 +632,9 @@ static int fxp_probe(fxp_t *fp, int skip)
 static void fxp_conf_hw(fxp_t *fp)
 {
        int mwi, ext_stat1, ext_stat2, lim_fifo, i82503, fc;
+#if VERBOSE
+       int i;
+#endif
 
        fp->fxp_mode= FM_DISABLED;      /* Superfluous */
 
index 38fb9a77175f247d56ce14dc111b2df25e23f176..196eff0865a7f215fcdd9a722d75f590d2902deb 100644 (file)
@@ -646,6 +646,9 @@ static void ec_init(ec)
 ether_card_t *ec;
 {
    int r;
+#if VERBOSE
+   int i;
+#endif
 
    /* General initialization */
    ec->flags = ECF_EMPTY;
index 96ffeefb49b151cc98f8d92ec6cf0a6299fd4f3d..55cea9c41e203d58d19079e8b589c1e1b2781299 100644 (file)
@@ -461,6 +461,9 @@ int skip;
        u16_t vid, did;
        u32_t bar;
        u8_t ilr;
+#if VERBOSE
+       char *dname;
+#endif
 
        if ((rep->re_pcibus | rep->re_pcidev | rep->re_pcifunc) != 0)
        {
index e33d7096768e40650bf38c93ebbc581d412de158..3194fceac0653878ceb0033c34ffddd1183c355f 100644 (file)
@@ -187,6 +187,9 @@ PRIVATE void hw_init(struct port *pp)
        u8_t v8;
        u16_t v16;
        u32_t v32;
+#if USE_INTS
+       int r, irq;
+#endif
 
        devind= pp->p_devind;
        if (debug)
@@ -316,6 +319,9 @@ PRIVATE void do_int(struct port *pp)
        u32_t csr_event, csr_present, csr_control;
        u8_t v8;
        u16_t v16;
+#if USE_INTS
+       int r;
+#endif
 
        devind= pp->p_devind;
        v8= pci_attr_r8(devind, TI_CARD_CTRL);