[src/trunk]: src/sys/rump/dev/lib I forgot I didn't fix kern/40505 yet, and h...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5034e89caadc
branches:  trunk
changeset: 752061:5034e89caadc
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Feb 12 12:07:12 2010 +0000

description:
I forgot I didn't fix kern/40505 yet, and hence using delay()/DELAY()
in rumps is hard due to some archs having a colorful idea of what
they should be like.  So temporarily disable build of components
using those for non-i386 (use the no-need-to-mess-with-setlists
approach).

diffstat:

 sys/rump/dev/lib/libumass/Makefile |  9 ++++++---
 sys/rump/dev/lib/libumass/dummy.c  |  1 +
 sys/rump/dev/lib/libusb/Makefile   |  6 +++++-
 sys/rump/dev/lib/libusb/dummy.c    |  1 +
 4 files changed, 13 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r c10aea889e4c -r 5034e89caadc sys/rump/dev/lib/libumass/Makefile
--- a/sys/rump/dev/lib/libumass/Makefile        Fri Feb 12 11:39:33 2010 +0000
+++ b/sys/rump/dev/lib/libumass/Makefile        Fri Feb 12 12:07:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2010/02/11 02:22:09 pooka Exp $
+#      $NetBSD: Makefile,v 1.2 2010/02/12 12:07:12 pooka Exp $
 #
 #
 # umass.  includes scsibus+sd for simplicity due to the umass code
@@ -8,7 +8,9 @@
 .PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/scsipi
 
 LIB=   rumpdev_umass
+IOCONFIG= UMASS.ioconf
 
+.if ${MACHINE} == "i386"
 SRCS=  umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
 SRCS+= scsipiconf.c scsipi_base.c scsipi_ioctl.c scsi_base.c scsiconf.c
 SRCS+= atapi_base.c atapiconf.c
@@ -16,8 +18,9 @@
 SRCS+= cd.c sd.c
 
 SRCS+= sd_at_scsibus_at_umass.c
-
-IOCONFIG= UMASS.ioconf
+.else
+SRCS=  dummy.c
+.endif
 
 CFLAGS+=       -Wno-pointer-sign
 CPPFLAGS+=     -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpvfs
diff -r c10aea889e4c -r 5034e89caadc sys/rump/dev/lib/libumass/dummy.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libumass/dummy.c Fri Feb 12 12:07:12 2010 +0000
@@ -0,0 +1,1 @@
+int nada;
diff -r c10aea889e4c -r 5034e89caadc sys/rump/dev/lib/libusb/Makefile
--- a/sys/rump/dev/lib/libusb/Makefile  Fri Feb 12 11:39:33 2010 +0000
+++ b/sys/rump/dev/lib/libusb/Makefile  Fri Feb 12 12:07:12 2010 +0000
@@ -1,12 +1,16 @@
-#      $NetBSD: Makefile,v 1.1 2010/02/11 02:22:10 pooka Exp $
+#      $NetBSD: Makefile,v 1.2 2010/02/12 12:07:12 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/usb
 
 LIB=   rumpdev_usb
 
+.if ${MACHINE} == "i386"
 SRCS=  usb.c usbdi.c usbdi_util.c usb_mem.c usb_subr.c usb_quirks.c    \
        uhub.c usbroothub_subr.c
+.else
+SRCS=  dummy.c
+.endif
 
 #CPPFLAGS+= -DUHUB_DEBUG
 
diff -r c10aea889e4c -r 5034e89caadc sys/rump/dev/lib/libusb/dummy.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libusb/dummy.c   Fri Feb 12 12:07:12 2010 +0000
@@ -0,0 +1,1 @@
+int njet;