Fw: Re: kern/9660: awi driver fails on non-PC platforms

[Atsushi Onoe <onoe@sm.sony.co.jp>]

試せる人がいたらやってみてください。
よろしくお願いします。

尾上

---

• Subject: Re: kern/9660: awi driver fails on non-PC platforms
• From: Atsushi Onoe <onoe@sm.sony.co.jp>
• To: root@ihack.net
• Date: Thu, 23 Mar 2000 16:00:25 +0900 (JST)
• Message-Id: <200003230700.QAA00417@duplo.sm.sony.co.jp>
• In-Reply-To: Your message of "Wed, 22 Mar 2000 19:59:36 -0500 (EST)"<200003230059.TAA21341@lop-nor.ihack.net>
• References: <200003230059.TAA21341@lop-nor.ihack.net>
• Cc: gnats-bugs@gnats.netbsd.org

> >Fix:
> 	Alter awi_rxint() and awi_txint() to use byte accesses.

I've modified rather am79c930.c since am79c930 controller itself allows
unaligned access to the firmware and to the system.

Does this patch solve your problem?

Atsushi

Index: dev/ic/am79c930.c
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/ic/am79c930.c,v
retrieving revision 1.4
diff -u -r1.4 am79c930.c
--- am79c930.c	2000/03/22 11:22:22	1.4
+++ am79c930.c	2000/03/23 06:53:07
@@ -290,7 +290,16 @@
 	u_int32_t off;
 	u_int16_t val;
 {
-	bus_space_write_2(sc->sc_memt, sc->sc_memh, off,    val);
+	bus_space_tag_t t = sc->sc_memt;
+	bus_space_handle_t h = sc->sc_memh;
+
+	/* could be unaligned */
+	if ((off & 0x1) == 0)
+		bus_space_write_2(t, h, off,    val);
+	else {
+		bus_space_write_1(t, h, off,    val        & 0xff);
+		bus_space_write_1(t, h, off+1, (val >>  8) & 0xff);
+	}
 }
 
 static void mem_write_4 (sc, off, val)
@@ -298,7 +307,18 @@
 	u_int32_t off;
 	u_int32_t val;
 {
-	bus_space_write_4(sc->sc_memt, sc->sc_memh, off, val);
+	bus_space_tag_t t = sc->sc_memt;
+	bus_space_handle_t h = sc->sc_memh;
+
+	/* could be unaligned */
+	if ((off & 0x3) == 0)
+		bus_space_write_4(t, h, off,    val);
+	else {
+		bus_space_write_1(t, h, off,    val        & 0xff);
+		bus_space_write_1(t, h, off+1, (val >>  8) & 0xff);
+		bus_space_write_1(t, h, off+2, (val >> 16) & 0xff);
+		bus_space_write_1(t, h, off+3, (val >> 24) & 0xff);
+	}
 }
 
 static void mem_write_bytes (sc, off, ptr, len)
@@ -322,14 +342,28 @@
 	struct am79c930_softc *sc;
 	u_int32_t off;
 {
-	return bus_space_read_2(sc->sc_memt, sc->sc_memh, off);
+	/* could be unaligned */
+	if ((off & 0x1) == 0)
+		return bus_space_read_2(sc->sc_memt, sc->sc_memh, off);
+	else
+		return
+		     bus_space_read_1(sc->sc_memt, sc->sc_memh, off  )       |
+		    (bus_space_read_1(sc->sc_memt, sc->sc_memh, off+1) << 8);
 }
 
 static u_int32_t mem_read_4 (sc, off)
 	struct am79c930_softc *sc;
 	u_int32_t off;
 {
-	return bus_space_read_4(sc->sc_memt, sc->sc_memh, off);
+	/* could be unaligned */
+	if ((off & 0x3) == 0)
+		return bus_space_read_4(sc->sc_memt, sc->sc_memh, off);
+	else
+		return
+		     bus_space_read_1(sc->sc_memt, sc->sc_memh, off  )       |
+		    (bus_space_read_1(sc->sc_memt, sc->sc_memh, off+1) << 8) |
+		    (bus_space_read_1(sc->sc_memt, sc->sc_memh, off+2) <<16) |
+		    (bus_space_read_1(sc->sc_memt, sc->sc_memh, off+3) <<24);
 }
 
 

---