Subject: 'sys/arch/mac68k/mac68k/machdep.c' fails without zs(4)
To: None <port-mac68k@netbsd.org>
From: Ed Schouten <ed@il.fontys.nl>
List: port-mac68k
Date: 12/11/2004 10:10:58
--SUOF0GtieIMvvwua
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello guys,

I was trying to build a new kernel for my Quadra 650 tonight. When I woke
up, I saw that machdep.c didn't compile because I did not specify zs(4) in
my config. Because I really really don't need zs(4) on my machine, I built a
small patch for it, which I attached below this message.

Yours sincerely,
--=20
  _________________=20
 /   Ed Schouten   \
 \ ed@il.fontys.nl /
  -----------------=20
        \   ,__,
         \  (oo)____
            (__)    )\
               ||--|| *

--

 machdep.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

--- /root/machdep.c	Sat Dec 11 10:03:58 2004
+++ machdep.c	Sat Dec 11 10:05:09 2004
@@ -2302,14 +2302,18 @@
 		Via1Base =3D (volatile u_char *)base;
=20
 		/* The following two may be overridden. */
+#if NZSC > 0
 		sccA =3D (volatile u_char *)base + 0xc000;
+#endif
 		SCSIBase =3D base + 0xf000;
=20
 		switch (current_mac_model->machineid) {
 		case MACH_MACQ900:
 		case MACH_MACQ950:
 			mac68k_machine.scsi96_2 =3D 1;
+#if NZSC > 0
 			sccA =3D (volatile u_char *)base + 0xc020;
+#endif
 			iop_init(0);	/* For console */
 			break;
 		case MACH_MACQ700:
@@ -2326,7 +2330,9 @@
 		 * Quadra-type machines.
 		 */
 		Via1Base =3D (volatile u_char *)base;
+#if NZSC > 0
 		sccA =3D (volatile u_char *)base + 0xc020;
+#endif
 		SCSIBase =3D base + 0x10000;
 		break;
 	case MACH_CLASSP580:
@@ -2335,12 +2341,16 @@
 		 * the two different Quadra classes.
 		 */
 		Via1Base =3D (volatile u_char *) base;
+#if NZSC > 0
 		sccA =3D (volatile u_char *) base + 0xc020;
+#endif
 		SCSIBase =3D base;
 		break;
 	case MACH_CLASSAV:
 		Via1Base =3D (volatile u_char *)base;
+#if NZSC > 0
 		sccA =3D (volatile u_char *)base + 0x4000;
+#endif
 		SCSIBase =3D base + 0x18000;
 		PSCBase =3D (volatile u_char *)base + 0x31000;
 		break;
@@ -2352,7 +2362,9 @@
 	case MACH_CLASSIIvx:
 	case MACH_CLASSLC:
 		Via1Base =3D (volatile u_char *)base;
+#if NZSC > 0
 		sccA =3D (volatile u_char *) base + 0x4000;
+#endif
 		SCSIBase =3D base;
 		break;
 	case MACH_CLASSIIfx:
@@ -2362,7 +2374,9 @@
 		 * the Serial Switch control panel before booting).
 		 */
 		Via1Base =3D (volatile u_char *)base;
+#if NZSC > 0
 		sccA =3D (volatile u_char *)base + 0x4020;
+#endif
 		SCSIBase =3D base;
 		iop_init(0);	/* For console */
 		break;

--SUOF0GtieIMvvwua
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (FreeBSD)

iD8DBQFBurmiyx16ydahrz4RAvlXAJ93FFNRdXn0X6DqJ4xmHgybY3VwSgCfVI4p
eO9jt0vlacurgNMaXkJhQfI=
=l3st
-----END PGP SIGNATURE-----

--SUOF0GtieIMvvwua--