]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - drivers/net/smc91111.h
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
[karo-tx-uboot.git] / drivers / net / smc91111.h
index 8dcbb3e2aa03d9bbc8fa3cecf28f1b8b850f4488..d70c66f58eb9ced81fe1860d81c436845fd05ca6 100644 (file)
@@ -31,7 +31,7 @@
  . information under www.smsc.com.
  .
  . Authors
- .     Erik Stahlman                           ( erik@vt.edu )
+ .     Erik Stahlman                           ( erik@vt.edu )
  .     Daris A Nevil                           ( dnevil@snmc.com )
  .
  . History
@@ -56,7 +56,11 @@ void smc_set_mac_addr (const unsigned char *addr);
 
 typedef unsigned char                  byte;
 typedef unsigned short                 word;
-typedef unsigned long int              dword;
+typedef unsigned long int              dword;
+
+struct smc91111_priv{
+       u8 dev_num;
+};
 
 /*
  . DEBUGGING LEVELS
@@ -74,35 +78,35 @@ typedef unsigned long int           dword;
 
 #define        SMC_IO_EXTENT   16
 
-#ifdef CONFIG_PXA250
+#ifdef CONFIG_CPU_PXA25X
 
 #ifdef CONFIG_XSENGINE
-#define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))))
-#define        SMC_inw(r)      (*((volatile word *)(SMC_BASE_ADDRESS+(r<<1))))
-#define SMC_inb(p)     ({ \
-       unsigned int __p = (unsigned int)(SMC_BASE_ADDRESS + (p<<1)); \
+#define        SMC_inl(a,r)    (*((volatile dword *)((a)->iobase+((r)<<1))))
+#define        SMC_inw(a,r)    (*((volatile word *)((a)->iobase+((r)<<1))))
+#define SMC_inb(a,p)  ({ \
+       unsigned int __p = (unsigned int)((a)->iobase + ((p)<<1)); \
        unsigned int __v = *(volatile unsigned short *)((__p) & ~2); \
        if (__p & 2) __v >>= 8; \
        else __v &= 0xff; \
        __v; })
 #elif defined(CONFIG_XAENIAX)
-#define SMC_inl(r)     (*((volatile dword *)(SMC_BASE_ADDRESS+(r))))
-#define SMC_inw(z)     ({ \
-       unsigned int __p = (unsigned int)(SMC_BASE_ADDRESS + (z)); \
+#define SMC_inl(a,r)   (*((volatile dword *)((a)->iobase+(r))))
+#define SMC_inw(a,z)   ({ \
+       unsigned int __p = (unsigned int)((a)->iobase + (z)); \
        unsigned int __v = *(volatile unsigned int *)((__p) & ~3); \
        if (__p & 3) __v >>= 16; \
        else __v &= 0xffff; \
        __v; })
-#define SMC_inb(p)     ({ \
-       unsigned int ___v = SMC_inw((p) & ~1); \
-       if (p & 1) ___v >>= 8; \
+#define SMC_inb(a,p)   ({ \
+       unsigned int ___v = SMC_inw((a),(p) & ~1); \
+       if ((p) & 1) ___v >>= 8; \
        else ___v &= 0xff; \
        ___v; })
 #else
-#define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r))))
-#define        SMC_inw(r)      (*((volatile word *)(SMC_BASE_ADDRESS+(r))))
-#define SMC_inb(p)     ({ \
-       unsigned int __p = (unsigned int)(SMC_BASE_ADDRESS + (p)); \
+#define        SMC_inl(a,r)    (*((volatile dword *)((a)->iobase+(r))))
+#define        SMC_inw(a,r)    (*((volatile word *)((a)->iobase+(r))))
+#define SMC_inb(a,p)   ({ \
+       unsigned int __p = (unsigned int)((a)->iobase + (p)); \
        unsigned int __v = *(volatile unsigned short *)((__p) & ~1); \
        if (__p & 1) __v >>= 8; \
        else __v &= 0xff; \
@@ -110,73 +114,142 @@ typedef unsigned long int                dword;
 #endif
 
 #ifdef CONFIG_XSENGINE
-#define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))) = d)
-#define        SMC_outw(d,r)   (*((volatile word *)(SMC_BASE_ADDRESS+(r<<1))) = d)
+#define        SMC_outl(a,d,r) (*((volatile dword *)((a)->iobase+(r<<1))) = d)
+#define        SMC_outw(a,d,r) (*((volatile word *)((a)->iobase+(r<<1))) = d)
 #elif defined (CONFIG_XAENIAX)
-#define SMC_outl(d,r)  (*((volatile dword *)(SMC_BASE_ADDRESS+(r))) = d)
-#define SMC_outw(d,p)  ({ \
-       dword __dwo = SMC_inl((p) & ~3); \
+#define SMC_outl(a,d,r)        (*((volatile dword *)((a)->iobase+(r))) = d)
+#define SMC_outw(a,d,p)        ({ \
+       dword __dwo = SMC_inl((a),(p) & ~3); \
        dword __dwn = (word)(d); \
        __dwo &= ((p) & 3) ? 0x0000ffff : 0xffff0000; \
        __dwo |= ((p) & 3) ? __dwn << 16 : __dwn; \
-       SMC_outl(__dwo, (p) & ~3); \
+       SMC_outl((a), __dwo, (p) & ~3); \
 })
 #else
-#define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r))) = d)
-#define        SMC_outw(d,r)   (*((volatile word *)(SMC_BASE_ADDRESS+(r))) = d)
+#define        SMC_outl(a,d,r) (*((volatile dword *)((a)->iobase+(r))) = d)
+#define        SMC_outw(a,d,r) (*((volatile word *)((a)->iobase+(r))) = d)
 #endif
 
-#define        SMC_outb(d,r)   ({      word __d = (byte)(d);  \
-                               word __w = SMC_inw((r)&~1);  \
+#define        SMC_outb(a,d,r) ({      word __d = (byte)(d);  \
+                               word __w = SMC_inw((a),(r)&~1);  \
                                __w &= ((r)&1) ? 0x00FF : 0xFF00;  \
                                __w |= ((r)&1) ? __d<<8 : __d;  \
-                               SMC_outw(__w,(r)&~1);  \
+                               SMC_outw((a),__w,(r)&~1);  \
                        })
 
-#define SMC_outsl(r,b,l)       ({      int __i; \
+#define SMC_outsl(a,r,b,l)     ({      int __i; \
                                        dword *__b2; \
                                        __b2 = (dword *) b; \
                                        for (__i = 0; __i < l; __i++) { \
-                                           SMC_outl( *(__b2 + __i), r); \
+                                           SMC_outl((a), *(__b2 + __i), r); \
                                        } \
                                })
 
-#define SMC_outsw(r,b,l)       ({      int __i; \
+#define SMC_outsw(a,r,b,l)     ({      int __i; \
                                        word *__b2; \
                                        __b2 = (word *) b; \
                                        for (__i = 0; __i < l; __i++) { \
-                                           SMC_outw( *(__b2 + __i), r); \
+                                           SMC_outw((a), *(__b2 + __i), r); \
                                        } \
                                })
 
-#define SMC_insl(r,b,l)        ({      int __i ;  \
+#define SMC_insl(a,r,b,l)      ({      int __i ;  \
                                        dword *__b2;  \
-                                       __b2 = (dword *) b;  \
-                                       for (__i = 0; __i < l; __i++) {  \
-                                         *(__b2 + __i) = SMC_inl(r);  \
-                                         SMC_inl(0);  \
+                                       __b2 = (dword *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inl((a),(r));  \
+                                         SMC_inl((a),0);  \
                                        };  \
                                })
 
-#define SMC_insw(r,b,l)        ({      int __i ;  \
+#define SMC_insw(a,r,b,l)              ({      int __i ;  \
                                        word *__b2;  \
-                                       __b2 = (word *) b;  \
-                                       for (__i = 0; __i < l; __i++) {  \
-                                         *(__b2 + __i) = SMC_inw(r);  \
-                                         SMC_inw(0);  \
+                                       __b2 = (word *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inw((a),(r));  \
+                                         SMC_inw((a),0);  \
                                        };  \
                                })
 
-#define SMC_insb(r,b,l)        ({      int __i ;  \
+#define SMC_insb(a,r,b,l)      ({      int __i ;  \
                                        byte *__b2;  \
-                                       __b2 = (byte *) b;  \
-                                       for (__i = 0; __i < l; __i++) {  \
-                                         *(__b2 + __i) = SMC_inb(r);  \
-                                         SMC_inb(0);  \
+                                       __b2 = (byte *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inb((a),(r));  \
+                                         SMC_inb((a),0);  \
                                        };  \
                                })
 
-#else /* if not CONFIG_PXA250 */
+#elif defined(CONFIG_LEON)     /* if not CONFIG_CPU_PXA25X */
+
+#define SMC_LEON_SWAP16(_x_) ({ word _x = (_x_); ((_x << 8) | (_x >> 8)); })
+
+#define SMC_LEON_SWAP32(_x_)                   \
+    ({ dword _x = (_x_);                       \
+       ((_x << 24) |                           \
+       ((0x0000FF00UL & _x) <<  8) |           \
+       ((0x00FF0000UL & _x) >>  8) |           \
+       (_x  >> 24)); })
+
+#define        SMC_inl(a,r)    (SMC_LEON_SWAP32((*(volatile dword *)((a)->iobase+((r)<<0)))))
+#define        SMC_inl_nosw(a,r)       ((*(volatile dword *)((a)->iobase+((r)<<0))))
+#define        SMC_inw(a,r)    (SMC_LEON_SWAP16((*(volatile word *)((a)->iobase+((r)<<0)))))
+#define        SMC_inw_nosw(a,r)       ((*(volatile word *)((a)->iobase+((r)<<0))))
+#define SMC_inb(a,p)   ({ \
+       word ___v = SMC_inw((a),(p) & ~1); \
+       if ((p) & 1) ___v >>= 8; \
+       else ___v &= 0xff; \
+       ___v; })
+
+#define        SMC_outl(a,d,r) (*(volatile dword *)((a)->iobase+((r)<<0))=SMC_LEON_SWAP32(d))
+#define        SMC_outl_nosw(a,d,r)    (*(volatile dword *)((a)->iobase+((r)<<0))=(d))
+#define        SMC_outw(a,d,r) (*(volatile word *)((a)->iobase+((r)<<0))=SMC_LEON_SWAP16(d))
+#define        SMC_outw_nosw(a,d,r)    (*(volatile word *)((a)->iobase+((r)<<0))=(d))
+#define        SMC_outb(a,d,r) do{     word __d = (byte)(d);  \
+                               word __w = SMC_inw((a),(r)&~1);  \
+                               __w &= ((r)&1) ? 0x00FF : 0xFF00;  \
+                               __w |= ((r)&1) ? __d<<8 : __d;  \
+                               SMC_outw((a),__w,(r)&~1);  \
+                       }while(0)
+#define SMC_outsl(a,r,b,l)     do{     int __i; \
+                                       dword *__b2; \
+                                       __b2 = (dword *) b; \
+                                       for (__i = 0; __i < l; __i++) { \
+                                           SMC_outl_nosw((a), *(__b2 + __i), r); \
+                                       } \
+                               }while(0)
+#define SMC_outsw(a,r,b,l)     do{     int __i; \
+                                       word *__b2; \
+                                       __b2 = (word *) b; \
+                                       for (__i = 0; __i < l; __i++) { \
+                                           SMC_outw_nosw((a), *(__b2 + __i), r); \
+                                       } \
+                               }while(0)
+#define SMC_insl(a,r,b,l)      do{     int __i ;  \
+                                       dword *__b2;  \
+                                       __b2 = (dword *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inl_nosw((a),(r));  \
+                                       };  \
+                               }while(0)
+
+#define SMC_insw(a,r,b,l)              do{     int __i ;  \
+                                       word *__b2;  \
+                                       __b2 = (word *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inw_nosw((a),(r));  \
+                                       };  \
+                               }while(0)
+
+#define SMC_insb(a,r,b,l)              do{     int __i ;  \
+                                       byte *__b2;  \
+                                       __b2 = (byte *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inb((a),(r));  \
+                                       };  \
+                               }while(0)
+
+#else                  /* if not CONFIG_CPU_PXA25X and not CONFIG_LEON */
 
 #ifndef CONFIG_SMC_USE_IOFUNCS /* these macros don't work on some boards */
 /*
@@ -184,48 +257,48 @@ typedef unsigned long int                 dword;
  */
 
 #ifdef CONFIG_ADNPESC1
-#define        SMC_inw(r)      (*((volatile word *)(SMC_BASE_ADDRESS+((r)<<1))))
+#define        SMC_inw(a,r)    (*((volatile word *)((a)->iobase+((r)<<1))))
 #elif CONFIG_BLACKFIN
-#define        SMC_inw(r)      ({ word __v = (*((volatile word *)(SMC_BASE_ADDRESS+(r)))); SSYNC(); __v;})
+#define        SMC_inw(a,r)    ({ word __v = (*((volatile word *)((a)->iobase+(r)))); SSYNC(); __v;})
 #else
-#define        SMC_inw(r)      (*((volatile word *)(SMC_BASE_ADDRESS+(r))))
+#define        SMC_inw(a,r)    (*((volatile word *)((a)->iobase+(r))))
 #endif
-#define  SMC_inb(r)    (((r)&1) ? SMC_inw((r)&~1)>>8 : SMC_inw(r)&0xFF)
+#define  SMC_inb(a,r)  (((r)&1) ? SMC_inw((a),(r)&~1)>>8 : SMC_inw((a),(r)&0xFF))
 
 #ifdef CONFIG_ADNPESC1
-#define        SMC_outw(d,r)   (*((volatile word *)(SMC_BASE_ADDRESS+((r)<<1))) = d)
+#define        SMC_outw(a,d,r) (*((volatile word *)((a)->iobase+((r)<<1))) = d)
 #elif CONFIG_BLACKFIN
-#define        SMC_outw(d,r)   {(*((volatile word *)(SMC_BASE_ADDRESS+(r))) = d); SSYNC();}
+#define        SMC_outw(a,d,r) {(*((volatile word *)((a)->iobase+(r))) = d); SSYNC();}
 #else
-#define        SMC_outw(d,r)   (*((volatile word *)(SMC_BASE_ADDRESS+(r))) = d)
+#define        SMC_outw(a,d,r) (*((volatile word *)((a)->iobase+(r))) = d)
 #endif
-#define        SMC_outb(d,r)   ({      word __d = (byte)(d);  \
-                               word __w = SMC_inw((r)&~1);  \
+#define        SMC_outb(a,d,r) ({      word __d = (byte)(d);  \
+                               word __w = SMC_inw((a),(r)&~1);  \
                                __w &= ((r)&1) ? 0x00FF : 0xFF00;  \
                                __w |= ((r)&1) ? __d<<8 : __d;  \
-                               SMC_outw(__w,(r)&~1);  \
+                               SMC_outw((a),__w,(r)&~1);  \
                        })
 #if 0
-#define        SMC_outsw(r,b,l)        outsw(SMC_BASE_ADDRESS+(r), (b), (l))
+#define        SMC_outsw(a,r,b,l)      outsw((a)->iobase+(r), (b), (l))
 #else
-#define SMC_outsw(r,b,l)       ({      int __i; \
+#define SMC_outsw(a,r,b,l)     ({      int __i; \
                                        word *__b2; \
                                        __b2 = (word *) b; \
                                        for (__i = 0; __i < l; __i++) { \
-                                           SMC_outw( *(__b2 + __i), r); \
+                                           SMC_outw((a), *(__b2 + __i), r); \
                                        } \
                                })
 #endif
 
 #if 0
-#define        SMC_insw(r,b,l)         insw(SMC_BASE_ADDRESS+(r), (b), (l))
+#define        SMC_insw(a,r,b,l)       insw((a)->iobase+(r), (b), (l))
 #else
-#define SMC_insw(r,b,l)        ({      int __i ;  \
+#define SMC_insw(a,r,b,l)      ({      int __i ;  \
                                        word *__b2;  \
-                                       __b2 = (word *) b;  \
-                                       for (__i = 0; __i < l; __i++) {  \
-                                         *(__b2 + __i) = SMC_inw(r);  \
-                                         SMC_inw(0);  \
+                                       __b2 = (word *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inw((a),(r));  \
+                                         SMC_inw((a),0);  \
                                        };  \
                                })
 #endif
@@ -235,30 +308,30 @@ typedef unsigned long int                 dword;
 #if defined(CONFIG_SMC_USE_32_BIT)
 
 #ifdef CONFIG_XSENGINE
-#define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))))
+#define        SMC_inl(a,r)    (*((volatile dword *)((a)->iobase+(r<<1))))
 #else
-#define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r))))
+#define        SMC_inl(a,r)    (*((volatile dword *)((a)->iobase+(r))))
 #endif
 
-#define SMC_insl(r,b,l)        ({      int __i ;  \
+#define SMC_insl(a,r,b,l)      ({      int __i ;  \
                                        dword *__b2;  \
-                                       __b2 = (dword *) b;  \
-                                       for (__i = 0; __i < l; __i++) {  \
-                                         *(__b2 + __i) = SMC_inl(r);  \
-                                         SMC_inl(0);  \
+                                       __b2 = (dword *) b;  \
+                                       for (__i = 0; __i < l; __i++) {  \
+                                         *(__b2 + __i) = SMC_inl((a),(r));  \
+                                         SMC_inl((a),0);  \
                                        };  \
                                })
 
 #ifdef CONFIG_XSENGINE
-#define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))) = d)
+#define        SMC_outl(a,d,r) (*((volatile dword *)((a)->iobase+(r<<1))) = d)
 #else
-#define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r))) = d)
+#define        SMC_outl(a,d,r) (*((volatile dword *)((a)->iobase+(r))) = d)
 #endif
-#define SMC_outsl(r,b,l)       ({      int __i; \
+#define SMC_outsl(a,r,b,l)     ({      int __i; \
                                        dword *__b2; \
                                        __b2 = (dword *) b; \
                                        for (__i = 0; __i < l; __i++) { \
-                                           SMC_outl( *(__b2 + __i), r); \
+                                           SMC_outl((a), *(__b2 + __i), r); \
                                        } \
                                })
 
@@ -283,21 +356,21 @@ typedef unsigned long int                 dword;
  . Bank Select Register:
  .
  .             yyyy yyyy 0000 00xx
- .             xx              = bank number
+ .             xx              = bank number
  .             yyyy yyyy       = 0x33, for identification purposes.
 */
 #define        BANK_SELECT             14
 
 /* Transmit Control Register */
 /* BANK 0  */
-#define        TCR_REG         0x0000  /* transmit control register */
+#define        TCR_REG         0x0000  /* transmit control register */
 #define TCR_ENABLE     0x0001  /* When 1 we can transmit */
 #define TCR_LOOP       0x0002  /* Controls output pin LBK */
 #define TCR_FORCOL     0x0004  /* When 1 will force a collision */
 #define TCR_PAD_EN     0x0080  /* When 1 will pad tx frames < 64 bytes w/0 */
 #define TCR_NOCRC      0x0100  /* When 1 will not append CRC to tx frames */
 #define TCR_MON_CSN    0x0400  /* When 1 tx monitors carrier */
-#define TCR_FDUPLX     0x0800  /* When 1 enables full duplex operation */
+#define TCR_FDUPLX     0x0800  /* When 1 enables full duplex operation */
 #define TCR_STP_SQET   0x1000  /* When 1 stops tx if Signal Quality Error */
 #define        TCR_EPH_LOOP    0x2000  /* When 1 enables EPH block loopback */
 #define        TCR_SWFDUP      0x8000  /* When 1 enables Switched Full Duplex mode */
@@ -305,7 +378,7 @@ typedef unsigned long int           dword;
 #define        TCR_CLEAR       0       /* do NOTHING */
 /* the default settings for the TCR register : */
 /* QUESTION: do I want to enable padding of short packets ? */
-#define        TCR_DEFAULT     TCR_ENABLE
+#define        TCR_DEFAULT     TCR_ENABLE
 
 
 /* EPH Status Register */
@@ -337,7 +410,7 @@ typedef unsigned long int           dword;
 #define        RCR_STRIP_CRC   0x0200  /* When set strips CRC from rx packets */
 #define        RCR_ABORT_ENB   0x0200  /* When set will abort rx on collision */
 #define        RCR_FILT_CAR    0x0400  /* When set filters leading 12 bit s of carrier */
-#define RCR_SOFTRST    0x8000  /* resets the chip */
+#define RCR_SOFTRST    0x8000  /* resets the chip */
 
 /* the normal settings for the RCR register : */
 #define        RCR_DEFAULT     (RCR_STRIP_CRC | RCR_RXEN)
@@ -438,11 +511,11 @@ typedef unsigned long int                 dword;
 #define MMU_CMD_REG    0x0000
 #define MC_BUSY                1       /* When 1 the last release has not completed */
 #define MC_NOP         (0<<5)  /* No Op */
-#define        MC_ALLOC        (1<<5)  /* OR with number of 256 byte packets */
+#define        MC_ALLOC        (1<<5)  /* OR with number of 256 byte packets */
 #define        MC_RESET        (2<<5)  /* Reset MMU to initial state */
-#define        MC_REMOVE       (3<<5)  /* Remove the current rx packet */
-#define MC_RELEASE     (4<<5)  /* Remove and release the current rx packet */
-#define MC_FREEPKT     (5<<5)  /* Release packet in PNR register */
+#define        MC_REMOVE       (3<<5)  /* Remove the current rx packet */
+#define MC_RELEASE     (4<<5)  /* Remove and release the current rx packet */
+#define MC_FREEPKT     (5<<5)  /* Release packet in PNR register */
 #define MC_ENQUEUE     (6<<5)  /* Enqueue the packet for transmit */
 #define MC_RSTTXFIFO   (7<<5)  /* Reset the TX FIFOs */
 
@@ -474,7 +547,7 @@ typedef unsigned long int           dword;
 /* BANK 2 */
 #define PTR_REG                0x0006
 #define        PTR_RCV         0x8000 /* 1=Receive area, 0=Transmit area */
-#define        PTR_AUTOINC     0x4000 /* Auto increment the pointer on each access */
+#define        PTR_AUTOINC     0x4000 /* Auto increment the pointer on each access */
 #define PTR_READ       0x2000 /* When 1 the operation is a read */
 #define PTR_NOTEMPTY   0x0800 /* When 1 _do not_ write fifo DATA REG */
 
@@ -683,25 +756,25 @@ enum {
 
 /* select a register bank, 0 to 3  */
 
-#define SMC_SELECT_BANK(x)  { SMC_outw( x, BANK_SELECT ); }
+#define SMC_SELECT_BANK(a,x)  { SMC_outw((a), (x), BANK_SELECT ); }
 
 /* this enables an interrupt in the interrupt mask register */
-#define SMC_ENABLE_INT(x) {\
+#define SMC_ENABLE_INT(a,x) {\
                unsigned char mask;\
-               SMC_SELECT_BANK(2);\
-               mask = SMC_inb( IM_REG );\
+               SMC_SELECT_BANK((a),2);\
+               mask = SMC_inb((a), IM_REG );\
                mask |= (x);\
-               SMC_outb( mask, IM_REG ); \
+               SMC_outb( (a), mask, IM_REG ); \
 }
 
 /* this disables an interrupt from the interrupt mask register */
 
-#define SMC_DISABLE_INT(x) {\
+#define SMC_DISABLE_INT(a,x) {\
                unsigned char mask;\
                SMC_SELECT_BANK(2);\
-               mask = SMC_inb( IM_REG );\
+               mask = SMC_inb( (a), IM_REG );\
                mask &= ~(x);\
-               SMC_outb( mask, IM_REG ); \
+               SMC_outb( (a), mask, IM_REG ); \
 }
 
 /*----------------------------------------------------------------------