usleep's pvrxxx port and FreeBSD 8.0-stable

[Torfinn Ingolfsen]

More info:
This is the port fetched from: http://usleepless.110mb.com/pvrxxx_port.tgz
I have now upgraded to FreeBSD 8.1-prerelease:
root at kg-fil# uname -a
FreeBSD kg-fil.kg4.no 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #4: Fri May 21 00:20:01 CEST 2010     root at kg-fil.kg4.no:/usr/obj/usr/src/sys/GENERIC  amd64
root at kg-fil# pwd
/usr/ports/multimedia/pvrxxx
I  do 'make patch'
I edit work/dev/cxm/cxm_i2c.c, adding the line:
DRIVER_MODULE(iicbb, cxm_iic, iicbb_driver, iicbb_devclass, 0, 0);
Which gives this diff:
root at kg-fil# diff -u work/dev/cxm/cxm_i2c.c.orig work/dev/cxm/cxm_i2c.c
--- work/dev/cxm/cxm_i2c.c.orig	2010-05-21 10:46:30.000000000 +0200
+++ work/dev/cxm/cxm_i2c.c	2010-05-21 10:48:25.000000000 +0200
@@ -131,6 +131,7 @@
 #endif
 MODULE_VERSION(cxm_iic, 1);
 DRIVER_MODULE(cxm_iic, cxm, cxm_iic_driver, cxm_iic_devclass, 0, 0);
+DRIVER_MODULE(iicbb, cxm_iic, iicbb_driver, iicbb_devclass, 0, 0);
 
 
 /*
@@ -375,6 +376,7 @@
 	 */
 
 	(void)CSR_READ_4(sc, CXM_REG_I2C_SETSCL);
+
 }
 
 
@@ -396,6 +398,7 @@
 	 */
 
 	(void)CSR_READ_4(sc, CXM_REG_I2C_SETSDA);
+
 }
 
 
@@ -408,6 +411,6 @@
 	cxm_iic_setsda(dev, data);
 
 	/* Wait for 10 usec */
-	DELAY(10);
+	DELAY(5);
 }
 #endif

Then I do 'make':
root at kg-fil# make
===>  Configuring for pvrxxx-09042008
cd /usr/ports/multimedia/pvrxxx/work/modules/cxm;  cd cxm_cx25840fw; tar xzf /usr/ports/distfiles//firmware.tar.gz v4l-cx25840.fw;  cd ../cxm_decfw; tar xzf /usr/ports/distfiles//firmware.tar.gz v4l-cx2341x-dec.fw;  cd ../cxm_encfw; tar xzf /usr/ports/distfiles//firmware.tar.gz v4l-cx2341x-enc.fw
===>  Building for pvrxxx-09042008
cd /usr/ports/multimedia/pvrxxx/work/modules/cxm; make
===> cxm (all)
Warning: Object directory not changed from original /usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm
@ -> /usr/src/sys
machine -> /usr/src/sys/amd64/include
:> opt_cxm.h
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
awk -f @/tools/makeobjops.awk @/kern/device_if.m -h
awk -f @/tools/makeobjops.awk @/dev/iicbus/iicbb_if.m -h
awk -f @/tools/makeobjops.awk @/dev/pci/pci_if.m -h
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -p
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -q
awk -f @/tools/vnode_if.awk @/kern/vnode_if.src -h
cc -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc  -I../../.. -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common  -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone  -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow  -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c: In function 'cxm_open':
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c:2484: error: invalid operands to binary &
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c: In function 'cxm_close':
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c:2517: error: invalid operands to binary &
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c: In function 'cxm_read':
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c:2565: error: invalid operands to binary &
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c: In function 'cxm_ioctl':
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c:2679: error: invalid operands to binary &
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c: In function 'cxm_poll':
/usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm/../../../dev/cxm/cxm.c:3266: error: invalid operands to binary &
*** Error code 1

Stop in /usr/ports/multimedia/pvrxxx/work/modules/cxm/cxm.
*** Error code 1

Stop in /usr/ports/multimedia/pvrxxx/work/modules/cxm.
*** Error code 1

Stop in /usr/ports/multimedia/pvrxxx.

Any hints?
-- 
Torfinn