diff --git a/sys/arch/sandpoint/stand/netboot/kse.c b/sys/arch/sandpoint/stand/netboot/kse.c
index de3590bcc4a0..906522747ff0 100644
--- a/sys/arch/sandpoint/stand/netboot/kse.c
+++ b/sys/arch/sandpoint/stand/netboot/kse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kse.c,v 1.2 2009/01/12 09:41:59 tsutsui Exp $ */
+/* $NetBSD: kse.c,v 1.3 2009/01/25 03:39:28 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -44,8 +44,10 @@
  * - no VTOPHYS() translation, vaddr_t == paddr_t. 
  * - PIPT writeback cache aware.
  */
-#define CSR_READ(l, r)		in32rb((l)->csr+(r))
-#define CSR_WRITE(l, r, v) 	out32rb((l)->csr+(r), (v))
+#define CSR_READ_4(l, r)	in32rb((l)->csr+(r))
+#define CSR_WRITE_4(l, r, v) 	out32rb((l)->csr+(r), (v))
+#define CSR_READ_2(l, r)	in16rb((l)->csr+(r))
+#define CSR_WRITE_2(l, r, v) 	out16rb((l)->csr+(r), (v))
 #define VTOPHYS(va) 		(uint32_t)(va)
 #define DEVTOV(pa) 		(uint32_t)(pa)
 #define wbinv(adr, siz)		_wbinv(VTOPHYS(adr), (uint32_t)(siz))
@@ -92,18 +94,9 @@ struct desc {
 #define MARM	0x202	/* MAC address middle */
 #define MARH	0x204	/* MAC address high */
 #define CIDR	0x400	/* chip ID and enable */
-#define P1CR4	0x510	/* port 1 control 4 */
+#define P1CR4	0x512	/* port 1 control 4 */
 #define P1SR	0x514	/* port 1 status */
 
-#define CSR_READ_4(l, off) \
-	    *(volatile unsigned *)((l)->csr + (off))
-#define CSR_WRITE_4(l, off, val) \
-	    *(volatile unsigned *)((l)->csr + (off)) = (val)
-#define CSR_READ_2(l, off) \
-	    *(volatile unsigned short *)((l)->csr + (off))
-#define CSR_WRITE_2(l, off, val) \
-	    *(volatile unsigned short *)((l)->csr + (off)) = (val)
-
 #define FRAMESIZE	1536
 
 struct local {
@@ -161,7 +154,7 @@ kse_init(unsigned tag, void *data)
 
 	val = pcicfgread(tag, PCI_ID_REG);
 	if (PCI_PRODUCT(val) == 0x8841) {
-		val = CSR_READ_4(l, P1SR);
+		val = CSR_READ_2(l, P1SR);
 		fdx = !!(val & (1U << 9));
 		printf("%s", (val & (1U << 8)) ? "100Mbps" : "10Mbps");
 		if (fdx)
@@ -203,7 +196,7 @@ kse_send(void *dev, char *buf, unsigned len)
 	txd->xd1 = htole32(T1_FS | T1_LS | (len & T1_TBS_MASK));
 	txd->xd0 = htole32(T0_OWN);
 	wbinv(txd, sizeof(struct desc));
-	CSR_WRITE(l, MDTSC, 01); /* start transmission */
+	CSR_WRITE_4(l, MDTSC, 01); /* start transmission */
 	loop = 100;
 	do {
 		txstat = le32toh(txd->xd0);
@@ -244,7 +237,7 @@ printf("recving with %u sec. timeout\n", timo);
 		rxd->xd0 = htole32(R0_OWN);
 		wbinv(rxd, sizeof(struct desc));
 		l->rx ^= 1;
-		CSR_WRITE(l, MDRSC, 01); /* restart receiving */
+		CSR_WRITE_4(l, MDRSC, 01); /* restart receiving */
 		goto again;
 	}
 	/* good frame */
@@ -257,7 +250,7 @@ printf("recving with %u sec. timeout\n", timo);
 	rxd->xd0 = htole32(R0_OWN);
 	wbinv(rxd, sizeof(struct desc));
 	l->rx ^= 1;
-	CSR_WRITE(l, MDRSC, 01); /* necessary? */
+	CSR_WRITE_4(l, MDRSC, 01); /* necessary? */
 	return len;
 }
 
@@ -267,10 +260,10 @@ mii_dealan(struct local *l, unsigned timo)
 	unsigned val, bound;
 
 	val = (1U << 13) | (1U << 7) | 0x1f /* advertise all caps */;
-	CSR_WRITE_4(l, P1CR4, val);
+	CSR_WRITE_2(l, P1CR4, val);
 	bound = getsecs() + timo;
 	do {
-		val = CSR_READ_4(l, P1SR);
+		val = CSR_READ_2(l, P1SR);
 		if (val & (1U << 5)) /* link is found up */
 			break;
 		DELAY(10 * 1000);
diff --git a/sys/arch/sandpoint/stand/netboot/nvt.c b/sys/arch/sandpoint/stand/netboot/nvt.c
index af1d17f5075c..682b9b44c1d8 100644
--- a/sys/arch/sandpoint/stand/netboot/nvt.c
+++ b/sys/arch/sandpoint/stand/netboot/nvt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nvt.c,v 1.16 2009/01/12 09:41:59 tsutsui Exp $ */
+/* $NetBSD: nvt.c,v 1.17 2009/01/25 03:39:28 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -175,21 +175,16 @@ nvt_init(unsigned tag, void *data)
 	struct desc *txd, *rxd;
 	uint8_t *en;
 
-	val = pcicfgread(tag, PCI_ID_REG);
-	if (PCI_DEVICE(0x1106, 0x3053) != val
-	    && PCI_DEVICE(0x1106, 0x3065) != val)
-		return NULL;
-
 	l = ALLOC(struct local, sizeof(struct desc)); /* desc alignment */
 	memset(l, 0, sizeof(struct local));
-	l->csr = DEVTOV(pcicfgread(tag, 0x14)); /* use mem space */
+	l->csr = ~01 & DEVTOV(pcicfgread(tag, 0x10)); /* use IO space */
 
 	val = CTL1_RESET;
 	CSR_WRITE_1(l, VR_CTL1, val);
 	do {
 		val = CSR_READ_1(l, VR_CTL1);
 	} while (val & CTL1_RESET);
-
+	/* PHY number is loaded from EEPROM */
 	l->phy = CSR_READ_1(l, VR_MIICFG) & 0x1f;
 
 	en = data;
diff --git a/sys/arch/sandpoint/stand/netboot/pcn.c b/sys/arch/sandpoint/stand/netboot/pcn.c
index 4debad275612..3e85c47b176c 100644
--- a/sys/arch/sandpoint/stand/netboot/pcn.c
+++ b/sys/arch/sandpoint/stand/netboot/pcn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcn.c,v 1.15 2009/01/12 09:41:59 tsutsui Exp $ */
+/* $NetBSD: pcn.c,v 1.16 2009/01/25 03:39:28 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -44,10 +44,10 @@
  * - no vtophys() translation, vaddr_t == paddr_t. 
  * - PIPT writeback cache aware.
  */
-#define CSR_WRITE_2(l, r, v)	out16rb((l)->csr+(r), (v))
-#define CSR_READ_2(l, r)	in16rb((l)->csr+(r))
-#define CSR_WRITE_4(l, r, v) 	out32rb((l)->csr+(r), (v))
 #define CSR_READ_4(l, r)	in32rb((l)->csr+(r))
+#define CSR_WRITE_4(l, r, v) 	out32rb((l)->csr+(r), (v))
+#define CSR_READ_2(l, r)	in16rb((l)->csr+(r))
+#define CSR_WRITE_2(l, r, v)	out16rb((l)->csr+(r), (v))
 #define VTOPHYS(va) 		(uint32_t)(va)
 #define DEVTOV(pa) 		(uint32_t)(pa)
 #define wbinv(adr, siz)		_wbinv(VTOPHYS(adr), (uint32_t)(siz))
diff --git a/sys/arch/sandpoint/stand/netboot/tlp.c b/sys/arch/sandpoint/stand/netboot/tlp.c
index d448fe501ff2..2c901338f044 100644
--- a/sys/arch/sandpoint/stand/netboot/tlp.c
+++ b/sys/arch/sandpoint/stand/netboot/tlp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlp.c,v 1.21 2009/01/12 09:41:59 tsutsui Exp $ */
+/* $NetBSD: tlp.c,v 1.22 2009/01/25 03:39:28 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -44,8 +44,8 @@
  * - no vtophys() translation, vaddr_t == paddr_t. 
  * - PIPT writeback cache aware.
  */
-#define CSR_WRITE(l, r, v) 	out32rb((l)->csr+(r), (v))
 #define CSR_READ(l, r)		in32rb((l)->csr+(r))
+#define CSR_WRITE(l, r, v) 	out32rb((l)->csr+(r), (v))
 #define VTOPHYS(va) 		(uint32_t)(va)
 #define DEVTOV(pa) 		(uint32_t)(pa)
 #define wbinv(adr, siz)		_wbinv(VTOPHYS(adr), (uint32_t)(siz))
diff --git a/sys/arch/sandpoint/stand/netboot/wm.c b/sys/arch/sandpoint/stand/netboot/wm.c
index 0274c76d9811..b92058e58b30 100644
--- a/sys/arch/sandpoint/stand/netboot/wm.c
+++ b/sys/arch/sandpoint/stand/netboot/wm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wm.c,v 1.9 2009/01/12 09:41:59 tsutsui Exp $ */
+/* $NetBSD: wm.c,v 1.10 2009/01/25 03:39:28 nisimura Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -46,8 +46,8 @@
  * - no vtophys() translation, vaddr_t == paddr_t. 
  * - PIPT writeback cache aware.
  */
-#define CSR_WRITE(l, r, v) 	out32rb((l)->csr+(r), (v))
 #define CSR_READ(l, r)		in32rb((l)->csr+(r))
+#define CSR_WRITE(l, r, v) 	out32rb((l)->csr+(r), (v))
 #define VTOPHYS(va) 		(uint32_t)(va)
 #define DEVTOV(pa) 		(uint32_t)(pa)
 #define wbinv(adr, siz)		_wbinv(VTOPHYS(adr), (uint32_t)(siz))