Module Name: src
Committed By: pooka
Date: Fri Feb 12 12:07:12 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
src/sys/rump/dev/lib/libusb: Makefile
Added Files:
src/sys/rump/dev/lib/libumass: dummy.c
src/sys/rump/dev/lib/libusb: dummy.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libumass/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libumass/dummy.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libusb/dummy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.1 src/sys/rump/dev/lib/libumass/Makefile:1.2
--- src/sys/rump/dev/lib/libumass/Makefile:1.1 Thu Feb 11 02:22:09 2010
+++ src/sys/rump/dev/lib/libumass/Makefile Fri Feb 12 12:07:12 2010
@@ -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
Index: src/sys/rump/dev/lib/libusb/Makefile
diff -u src/sys/rump/dev/lib/libusb/Makefile:1.1 src/sys/rump/dev/lib/libusb/Makefile:1.2
--- src/sys/rump/dev/lib/libusb/Makefile:1.1 Thu Feb 11 02:22:10 2010
+++ src/sys/rump/dev/lib/libusb/Makefile Fri Feb 12 12:07:12 2010
@@ -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
Added files:
Index: src/sys/rump/dev/lib/libumass/dummy.c
diff -u /dev/null src/sys/rump/dev/lib/libumass/dummy.c:1.1
--- /dev/null Fri Feb 12 12:07:12 2010
+++ src/sys/rump/dev/lib/libumass/dummy.c Fri Feb 12 12:07:12 2010
@@ -0,0 +1 @@
+int nada;
Index: src/sys/rump/dev/lib/libusb/dummy.c
diff -u /dev/null src/sys/rump/dev/lib/libusb/dummy.c:1.1
--- /dev/null Fri Feb 12 12:07:13 2010
+++ src/sys/rump/dev/lib/libusb/dummy.c Fri Feb 12 12:07:12 2010
@@ -0,0 +1 @@
+int njet;
