diff --git a/src/drivers/net/3c509.h b/src/drivers/net/3c509.h
index fc94be8d..72f8e445 100644
--- a/src/drivers/net/3c509.h
+++ b/src/drivers/net/3c509.h
@@ -53,12 +53,6 @@
 #define EP_ID_PORT	0x100
 #endif
 
-/*
- * some macros to acces long named fields
- */
-#define IS_BASE (eth_nic_base)
-#define BASE	(eth_nic_base)
-
 /*
  * Commands to read/write EEPROM trough EEPROM command register (Window 0,
  * Offset 0xa)
@@ -75,7 +69,7 @@
  * Some short functions, worth to let them be a macro
  */
 #define is_eeprom_busy(b) (inw((b)+EP_W0_EEPROM_COMMAND)&EEPROM_BUSY)
-#define GO_WINDOW(x)	outw(WINDOW_SELECT|(x), BASE+EP_COMMAND)
+#define GO_WINDOW(b,x)	outw(WINDOW_SELECT|(x), (b)+EP_COMMAND)
 
 /**************************************************************************
  *