diff --git a/packages/linux/patches/linux-3.6.7-601-RPi_support-9641b52.patch b/packages/linux/patches/linux-3.6.7-601-RPi_support-29ab912.patch
similarity index 93%
rename from packages/linux/patches/linux-3.6.7-601-RPi_support-9641b52.patch
rename to packages/linux/patches/linux-3.6.7-601-RPi_support-29ab912.patch
index 581a5bef8e..e8353a6853 100644
--- a/packages/linux/patches/linux-3.6.7-601-RPi_support-9641b52.patch
+++ b/packages/linux/patches/linux-3.6.7-601-RPi_support-29ab912.patch
@@ -1,6 +1,6 @@
 diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.6.7.patch/arch/arm/configs/bcmrpi_cutdown_defconfig
 --- linux-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_cutdown_defconfig	2012-11-18 12:45:10.213326321 +0100
++++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_cutdown_defconfig	2012-11-18 20:53:34.980712692 +0100
 @@ -0,0 +1,546 @@
 +CONFIG_EXPERIMENTAL=y
 +CONFIG_LOCALVERSION="-cutdown"
@@ -550,8 +550,8 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.6.7.pat
 +CONFIG_LIBCRC32C=y
 diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-3.6.7.patch/arch/arm/configs/bcmrpi_defconfig
 --- linux-3.6.7/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_defconfig	2012-11-18 12:45:10.215326358 +0100
-@@ -0,0 +1,945 @@
++++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_defconfig	2012-11-18 20:53:34.981712711 +0100
+@@ -0,0 +1,948 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -1139,6 +1139,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-3.6.7.patch/arch/
 +CONFIG_DVB_USB_OPERA1=m
 +CONFIG_DVB_USB_AF9005=m
 +CONFIG_DVB_USB_AF9005_REMOTE=m
++CONFIG_DVB_USB_PCTV452E=m
 +CONFIG_DVB_USB_DW2102=m
 +CONFIG_DVB_USB_CINERGY_T2=m
 +CONFIG_DVB_USB_ANYSEE=m
@@ -1150,6 +1151,8 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-3.6.7.patch/arch/
 +CONFIG_DVB_USB_AZ6027=m
 +CONFIG_DVB_USB_LME2510=m
 +CONFIG_DVB_USB_TECHNISAT_USB2=m
++CONFIG_DVB_USB_IT913X=m
++CONFIG_DVB_USB_MXL111SF=m
 +CONFIG_SMS_SIANO_MDTV=m
 +CONFIG_SMS_USB_DRV=m
 +CONFIG_DVB_B2C2_FLEXCOP=m
@@ -1499,7 +1502,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-3.6.7.patch/arch/
 +CONFIG_LIBCRC32C=y
 diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.6.7.patch/arch/arm/configs/bcmrpi_emergency_defconfig
 --- linux-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_emergency_defconfig	2012-11-18 12:45:10.391329789 +0100
++++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_emergency_defconfig	2012-11-18 20:53:34.988712844 +0100
 @@ -0,0 +1,532 @@
 +CONFIG_EXPERIMENTAL=y
 +# CONFIG_LOCALVERSION_AUTO is not set
@@ -2035,7 +2038,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.6.7.p
 +CONFIG_LIBCRC32C=y
 diff -Naur linux-3.6.7/arch/arm/include/asm/fiq.h linux-3.6.7.patch/arch/arm/include/asm/fiq.h
 --- linux-3.6.7/arch/arm/include/asm/fiq.h	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/include/asm/fiq.h	2012-11-18 12:45:10.442330782 +0100
++++ linux-3.6.7.patch/arch/arm/include/asm/fiq.h	2012-11-18 20:53:34.989712863 +0100
 @@ -42,6 +42,7 @@
  /* helpers defined in fiqasm.S: */
  extern void __set_fiq_regs(unsigned long const *regs);
@@ -2046,7 +2049,7 @@ diff -Naur linux-3.6.7/arch/arm/include/asm/fiq.h linux-3.6.7.patch/arch/arm/inc
  {
 diff -Naur linux-3.6.7/arch/arm/Kconfig linux-3.6.7.patch/arch/arm/Kconfig
 --- linux-3.6.7/arch/arm/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/Kconfig	2012-11-18 12:45:10.461331155 +0100
++++ linux-3.6.7.patch/arch/arm/Kconfig	2012-11-18 20:53:34.990712882 +0100
 @@ -998,6 +998,23 @@
  	help
  	  Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
@@ -2081,7 +2084,7 @@ diff -Naur linux-3.6.7/arch/arm/Kconfig linux-3.6.7.patch/arch/arm/Kconfig
  config ARCH_ACORN
 diff -Naur linux-3.6.7/arch/arm/Kconfig.debug linux-3.6.7.patch/arch/arm/Kconfig.debug
 --- linux-3.6.7/arch/arm/Kconfig.debug	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/Kconfig.debug	2012-11-18 12:45:10.462331175 +0100
++++ linux-3.6.7.patch/arch/arm/Kconfig.debug	2012-11-18 20:53:34.991712901 +0100
 @@ -371,6 +371,14 @@
  		  For more details about semihosting, please see
  		  chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
@@ -2099,7 +2102,7 @@ diff -Naur linux-3.6.7/arch/arm/Kconfig.debug linux-3.6.7.patch/arch/arm/Kconfig
  config EARLY_PRINTK
 diff -Naur linux-3.6.7/arch/arm/kernel/fiqasm.S linux-3.6.7.patch/arch/arm/kernel/fiqasm.S
 --- linux-3.6.7/arch/arm/kernel/fiqasm.S	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/kernel/fiqasm.S	2012-11-18 12:45:10.469331314 +0100
++++ linux-3.6.7.patch/arch/arm/kernel/fiqasm.S	2012-11-18 20:53:34.991712901 +0100
 @@ -47,3 +47,7 @@
  	mov	r0, r0		@ avoid hazard prior to ARMv4
  	mov	pc, lr
@@ -2110,7 +2113,7 @@ diff -Naur linux-3.6.7/arch/arm/kernel/fiqasm.S linux-3.6.7.patch/arch/arm/kerne
 +ENDPROC(__FIQ_Branch)
 diff -Naur linux-3.6.7/arch/arm/kernel/fiq.c linux-3.6.7.patch/arch/arm/kernel/fiq.c
 --- linux-3.6.7/arch/arm/kernel/fiq.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/kernel/fiq.c	2012-11-18 12:45:10.470331333 +0100
++++ linux-3.6.7.patch/arch/arm/kernel/fiq.c	2012-11-18 20:53:34.992712920 +0100
 @@ -137,6 +137,7 @@
  EXPORT_SYMBOL(set_fiq_handler);
  EXPORT_SYMBOL(__set_fiq_regs);	/* defined in fiqasm.S */
@@ -2121,7 +2124,7 @@ diff -Naur linux-3.6.7/arch/arm/kernel/fiq.c linux-3.6.7.patch/arch/arm/kernel/f
  EXPORT_SYMBOL(enable_fiq);
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.c linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/armctrl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.c	2012-11-18 12:45:10.470331333 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.c	2012-11-18 20:53:34.992712920 +0100
 @@ -0,0 +1,227 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2352,7 +2355,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.c linux-3.6.7.patch/arch/ar
 +}
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.h linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/armctrl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.h	2012-11-18 12:45:10.471331352 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.h	2012-11-18 20:53:34.993712939 +0100
 @@ -0,0 +1,27 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2383,7 +2386,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.h linux-3.6.7.patch/arch/ar
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.c linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.c	2012-11-18 12:45:10.472331371 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.c	2012-11-18 20:53:34.994712958 +0100
 @@ -0,0 +1,951 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708.c
@@ -3338,7 +3341,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.c linux-3.6.7.patch/arch/ar
 +module_param(uart_clock, uint, 0644);
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c	2012-11-18 12:45:10.473331390 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c	2012-11-18 20:53:34.995712977 +0100
 @@ -0,0 +1,339 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -3681,7 +3684,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.6.7.patch/ar
 +MODULE_LICENSE("GPL");
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.h linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.h	2012-11-18 12:45:10.473331390 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.h	2012-11-18 20:53:34.995712977 +0100
 @@ -0,0 +1,51 @@
 +/*
 + * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -3736,7 +3739,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.h linux-3.6.7.patch/arch/ar
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.c linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/clock.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.c	2012-11-18 12:45:10.474331410 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.c	2012-11-18 20:53:34.996712996 +0100
 @@ -0,0 +1,61 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/clock.c
@@ -3801,7 +3804,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.c linux-3.6.7.patch/arch/arm/
 +EXPORT_SYMBOL(clk_set_rate);
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.h linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/clock.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.h	2012-11-18 12:45:10.474331410 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.h	2012-11-18 20:53:34.996712996 +0100
 @@ -0,0 +1,24 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/clock.h
@@ -3829,7 +3832,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.h linux-3.6.7.patch/arch/arm/
 +};
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/delay.S linux-3.6.7.patch/arch/arm/mach-bcm2708/delay.S
 --- linux-3.6.7/arch/arm/mach-bcm2708/delay.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/delay.S	2012-11-18 12:45:10.474331410 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/delay.S	2012-11-18 20:53:34.996712996 +0100
 @@ -0,0 +1,20 @@
 +/*
 + *  linux/arch/arm/lib/delay.S
@@ -3853,7 +3856,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/delay.S linux-3.6.7.patch/arch/arm/
 +ENDPROC(bcm2708_delay)
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/dma.c linux-3.6.7.patch/arch/arm/mach-bcm2708/dma.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/dma.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/dma.c	2012-11-18 12:45:10.475331431 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/dma.c	2012-11-18 20:53:34.997713015 +0100
 @@ -0,0 +1,397 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/dma.c
@@ -4254,7 +4257,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/dma.c linux-3.6.7.patch/arch/arm/ma
 +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h	2012-11-18 12:45:10.477331470 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h	2012-11-18 20:53:35.128715497 +0100
 @@ -0,0 +1,419 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/arm_control.h
@@ -4677,7 +4680,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h	2012-11-18 12:45:10.477331470 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h	2012-11-18 20:53:35.129715520 +0100
 @@ -0,0 +1,60 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -4741,7 +4744,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.6.
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h	2012-11-18 12:45:10.477331470 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h	2012-11-18 20:53:35.129715520 +0100
 @@ -0,0 +1,7 @@
 +#ifndef __ASM_MACH_CLKDEV_H
 +#define __ASM_MACH_CLKDEV_H
@@ -4752,7 +4755,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.6.7.p
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S	2012-11-18 12:45:10.478331489 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S	2012-11-18 20:53:35.130715541 +0100
 @@ -0,0 +1,22 @@
 +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
 + *
@@ -4778,7 +4781,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.
 +#include <asm/hardware/debug-pl01x.S>
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/dma.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/dma.h	2012-11-18 12:45:10.478331489 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/dma.h	2012-11-18 20:53:35.130715541 +0100
 @@ -0,0 +1,84 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -4866,7 +4869,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.6.7.patc
 +#endif /* _MACH_BCM2708_DMA_H */
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S	2012-11-18 12:45:10.479331508 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S	2012-11-18 20:53:35.131715561 +0100
 @@ -0,0 +1,69 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -4939,7 +4942,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.
 +		.endm
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/frc.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/frc.h	2012-11-18 12:45:10.479331508 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/frc.h	2012-11-18 20:53:35.132715579 +0100
 @@ -0,0 +1,38 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/timex.h
@@ -4981,7 +4984,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.6.7.patc
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/gpio.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/gpio.h	2012-11-18 12:45:10.480331527 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/gpio.h	2012-11-18 20:53:35.132715579 +0100
 @@ -0,0 +1,48 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -5033,7 +5036,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.6.7.pat
 +
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/hardware.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/hardware.h	2012-11-18 12:45:10.480331527 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/hardware.h	2012-11-18 20:53:35.133715597 +0100
 @@ -0,0 +1,28 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -5065,7 +5068,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.6.7
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/io.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/io.h	2012-11-18 12:45:10.480331527 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/io.h	2012-11-18 20:53:35.133715597 +0100
 @@ -0,0 +1,28 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/io.h
@@ -5097,7 +5100,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h linux-3.6.7.patch
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/irqs.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/irqs.h	2012-11-18 12:45:10.481331546 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/irqs.h	2012-11-18 20:53:35.134715615 +0100
 @@ -0,0 +1,199 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -5300,7 +5303,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.6.7.pat
 +#endif /* _BCM2708_IRQS_H_ */
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/memory.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/memory.h	2012-11-18 12:45:10.481331546 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/memory.h	2012-11-18 20:53:35.135715633 +0100
 @@ -0,0 +1,57 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/memory.h
@@ -5361,7 +5364,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.6.7.p
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/platform.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/platform.h	2012-11-18 12:45:10.482331566 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/platform.h	2012-11-18 20:53:35.136715652 +0100
 @@ -0,0 +1,225 @@
 +/*
 + * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -5590,7 +5593,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.6.7
 +/* END */
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/power.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/power.h	2012-11-18 12:45:10.483331587 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/power.h	2012-11-18 20:53:35.136715652 +0100
 @@ -0,0 +1,26 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/power.h
@@ -5620,7 +5623,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h linux-3.6.7.pa
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/system.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/system.h	2012-11-18 12:45:10.483331587 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/system.h	2012-11-18 20:53:35.137715672 +0100
 @@ -0,0 +1,38 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/system.h
@@ -5662,7 +5665,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h linux-3.6.7.p
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/timex.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/timex.h	2012-11-18 12:45:10.483331587 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/timex.h	2012-11-18 20:53:35.137715672 +0100
 @@ -0,0 +1,23 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/timex.h
@@ -5689,7 +5692,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.6.7.pa
 +#define CLOCK_TICK_RATE		(1000000)
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h	2012-11-18 12:45:10.484331607 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h	2012-11-18 20:53:35.138715692 +0100
 @@ -0,0 +1,85 @@
 +/*
 + *  arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -5778,7 +5781,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.6
 +
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vcio.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vcio.h	2012-11-18 12:45:10.484331607 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vcio.h	2012-11-18 20:53:35.138715692 +0100
 @@ -0,0 +1,108 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -5890,7 +5893,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.6.7.pat
 +#endif
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h	2012-11-18 12:45:10.485331626 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h	2012-11-18 20:53:35.139715712 +0100
 @@ -0,0 +1,36 @@
 +/*****************************************************************************
 +* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
@@ -5930,7 +5933,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.6.7.p
 +
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h
 --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h	2012-11-18 12:45:10.485331626 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h	2012-11-18 20:53:35.139715712 +0100
 @@ -0,0 +1,20 @@
 +/*
 + *  arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -5954,7 +5957,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.6.7.
 +#define VMALLOC_END		(0xe8000000)
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Kconfig linux-3.6.7.patch/arch/arm/mach-bcm2708/Kconfig
 --- linux-3.6.7/arch/arm/mach-bcm2708/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Kconfig	2012-11-18 12:45:10.485331626 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Kconfig	2012-11-18 20:53:35.140715731 +0100
 @@ -0,0 +1,34 @@
 +menu "Broadcom BCM2708 Implementations"
 +	depends on ARCH_BCM2708
@@ -5992,7 +5995,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Kconfig linux-3.6.7.patch/arch/arm/
 +endmenu
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile
 --- linux-3.6.7/arch/arm/mach-bcm2708/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile	2012-11-18 12:45:10.486331645 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile	2012-11-18 20:53:35.140715731 +0100
 @@ -0,0 +1,8 @@
 +#
 +# Makefile for the linux kernel.
@@ -6004,14 +6007,14 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile linux-3.6.7.patch/arch/arm
 +
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile.boot linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile.boot
 --- linux-3.6.7/arch/arm/mach-bcm2708/Makefile.boot	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile.boot	2012-11-18 12:45:10.486331645 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile.boot	2012-11-18 20:53:35.141715749 +0100
 @@ -0,0 +1,3 @@
 +   zreladdr-y	:= 0x00008000
 +params_phys-y	:= 0x00000100
 +initrd_phys-y	:= 0x00800000
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/power.c linux-3.6.7.patch/arch/arm/mach-bcm2708/power.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/power.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/power.c	2012-11-18 12:45:10.487331664 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/power.c	2012-11-18 20:53:35.141715749 +0100
 @@ -0,0 +1,194 @@
 +/*
 + *	 linux/arch/arm/mach-bcm2708/power.c
@@ -6209,7 +6212,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/power.c linux-3.6.7.patch/arch/arm/
 +MODULE_LICENSE("GPL");
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-3.6.7.patch/arch/arm/mach-bcm2708/vcio.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/vcio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/vcio.c	2012-11-18 12:45:10.487331664 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/vcio.c	2012-11-18 20:53:35.142715768 +0100
 @@ -0,0 +1,338 @@
 +/*
 + *  linux/arch/arm/mach-bcm2708/vcio.c
@@ -6551,7 +6554,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-3.6.7.patch/arch/arm/m
 +MODULE_ALIAS("platform:bcm-mbox");
 diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vc_mem.c linux-3.6.7.patch/arch/arm/mach-bcm2708/vc_mem.c
 --- linux-3.6.7/arch/arm/mach-bcm2708/vc_mem.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mach-bcm2708/vc_mem.c	2012-11-18 12:45:10.488331683 +0100
++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/vc_mem.c	2012-11-18 20:53:35.143715786 +0100
 @@ -0,0 +1,458 @@
 +/*****************************************************************************
 +* Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
@@ -7013,7 +7016,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vc_mem.c linux-3.6.7.patch/arch/arm
 +
 diff -Naur linux-3.6.7/arch/arm/Makefile linux-3.6.7.patch/arch/arm/Makefile
 --- linux-3.6.7/arch/arm/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/Makefile	2012-11-18 12:45:10.489331702 +0100
++++ linux-3.6.7.patch/arch/arm/Makefile	2012-11-18 20:53:35.143715786 +0100
 @@ -198,6 +198,7 @@
  machine-$(CONFIG_MACH_SPEAR320)		:= spear3xx
  machine-$(CONFIG_MACH_SPEAR600)		:= spear6xx
@@ -7024,7 +7027,7 @@ diff -Naur linux-3.6.7/arch/arm/Makefile linux-3.6.7.patch/arch/arm/Makefile
  # by CONFIG_* macro name.
 diff -Naur linux-3.6.7/arch/arm/mm/alignment.c linux-3.6.7.patch/arch/arm/mm/alignment.c
 --- linux-3.6.7/arch/arm/mm/alignment.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mm/alignment.c	2012-11-18 12:45:10.490331722 +0100
++++ linux-3.6.7.patch/arch/arm/mm/alignment.c	2012-11-18 20:53:35.144715804 +0100
 @@ -856,9 +856,11 @@
  	case 0x08000000:	/* ldm or stm, or thumb-2 32bit instruction */
  		if (thumb2_32b)
@@ -7041,7 +7044,7 @@ diff -Naur linux-3.6.7/arch/arm/mm/alignment.c linux-3.6.7.patch/arch/arm/mm/ali
  		goto bad;
 diff -Naur linux-3.6.7/arch/arm/mm/Kconfig linux-3.6.7.patch/arch/arm/mm/Kconfig
 --- linux-3.6.7/arch/arm/mm/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mm/Kconfig	2012-11-18 12:45:10.490331722 +0100
++++ linux-3.6.7.patch/arch/arm/mm/Kconfig	2012-11-18 20:53:35.145715823 +0100
 @@ -354,7 +354,7 @@
  
  # ARMv6
@@ -7053,7 +7056,7 @@ diff -Naur linux-3.6.7/arch/arm/mm/Kconfig linux-3.6.7.patch/arch/arm/mm/Kconfig
  	select CPU_PABRT_V6
 diff -Naur linux-3.6.7/arch/arm/mm/proc-v6.S linux-3.6.7.patch/arch/arm/mm/proc-v6.S
 --- linux-3.6.7/arch/arm/mm/proc-v6.S	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/mm/proc-v6.S	2012-11-18 12:45:10.491331743 +0100
++++ linux-3.6.7.patch/arch/arm/mm/proc-v6.S	2012-11-18 20:53:35.146715843 +0100
 @@ -73,10 +73,19 @@
   *
   *	IRQs are already disabled.
@@ -7079,7 +7082,7 @@ diff -Naur linux-3.6.7/arch/arm/mm/proc-v6.S linux-3.6.7.patch/arch/arm/mm/proc-
  ENTRY(cpu_v6_dcache_clean_area)
 diff -Naur linux-3.6.7/arch/arm/tools/mach-types linux-3.6.7.patch/arch/arm/tools/mach-types
 --- linux-3.6.7/arch/arm/tools/mach-types	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/arch/arm/tools/mach-types	2012-11-18 12:45:10.492331763 +0100
++++ linux-3.6.7.patch/arch/arm/tools/mach-types	2012-11-18 20:53:35.147715863 +0100
 @@ -519,6 +519,7 @@
  prima2_evb		MACH_PRIMA2_EVB		PRIMA2_EVB		3103
  paz00			MACH_PAZ00		PAZ00			3128
@@ -7090,7 +7093,7 @@ diff -Naur linux-3.6.7/arch/arm/tools/mach-types linux-3.6.7.patch/arch/arm/tool
  ics_if_voip		MACH_ICS_IF_VOIP	ICS_IF_VOIP		3206
 diff -Naur linux-3.6.7/drivers/char/broadcom/Kconfig linux-3.6.7.patch/drivers/char/broadcom/Kconfig
 --- linux-3.6.7/drivers/char/broadcom/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/char/broadcom/Kconfig	2012-11-18 12:45:10.492331763 +0100
++++ linux-3.6.7.patch/drivers/char/broadcom/Kconfig	2012-11-18 20:53:35.147715863 +0100
 @@ -0,0 +1,18 @@
 +#
 +# Broadcom char driver config
@@ -7112,13 +7115,13 @@ diff -Naur linux-3.6.7/drivers/char/broadcom/Kconfig linux-3.6.7.patch/drivers/c
 +
 diff -Naur linux-3.6.7/drivers/char/broadcom/Makefile linux-3.6.7.patch/drivers/char/broadcom/Makefile
 --- linux-3.6.7/drivers/char/broadcom/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/char/broadcom/Makefile	2012-11-18 12:45:10.493331782 +0100
++++ linux-3.6.7.patch/drivers/char/broadcom/Makefile	2012-11-18 20:53:35.147715863 +0100
 @@ -0,0 +1,2 @@
 +obj-$(CONFIG_BCM_VC_CMA)	+= vc_cma/
 +
 diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/Makefile linux-3.6.7.patch/drivers/char/broadcom/vc_cma/Makefile
 --- linux-3.6.7/drivers/char/broadcom/vc_cma/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/char/broadcom/vc_cma/Makefile	2012-11-18 12:45:10.493331782 +0100
++++ linux-3.6.7.patch/drivers/char/broadcom/vc_cma/Makefile	2012-11-18 20:53:35.148715882 +0100
 @@ -0,0 +1,15 @@
 +EXTRA_CFLAGS  += -Wall -Wstrict-prototypes -Wno-trigraphs
 +EXTRA_CFLAGS  += -Werror
@@ -7137,7 +7140,7 @@ diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/Makefile linux-3.6.7.patch/d
 +
 diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.6.7.patch/drivers/char/broadcom/vc_cma/vc_cma.c
 --- linux-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/char/broadcom/vc_cma/vc_cma.c	2012-11-18 12:45:10.495331821 +0100
++++ linux-3.6.7.patch/drivers/char/broadcom/vc_cma/vc_cma.c	2012-11-18 20:53:35.149715901 +0100
 @@ -0,0 +1,886 @@
 +/*****************************************************************************
 +* Copyright 2012 Broadcom Corporation.  All rights reserved.
@@ -8027,7 +8030,7 @@ diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.6.7.patch/d
 +MODULE_AUTHOR("Broadcom Corporation");
 diff -Naur linux-3.6.7/drivers/char/Kconfig linux-3.6.7.patch/drivers/char/Kconfig
 --- linux-3.6.7/drivers/char/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/char/Kconfig	2012-11-18 12:45:10.495331821 +0100
++++ linux-3.6.7.patch/drivers/char/Kconfig	2012-11-18 20:53:35.150715920 +0100
 @@ -585,6 +585,8 @@
  
  source "drivers/s390/char/Kconfig"
@@ -8039,7 +8042,7 @@ diff -Naur linux-3.6.7/drivers/char/Kconfig linux-3.6.7.patch/drivers/char/Kconf
  	default n
 diff -Naur linux-3.6.7/drivers/char/Makefile linux-3.6.7.patch/drivers/char/Makefile
 --- linux-3.6.7/drivers/char/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/char/Makefile	2012-11-18 12:45:10.496331840 +0100
++++ linux-3.6.7.patch/drivers/char/Makefile	2012-11-18 20:53:35.150715920 +0100
 @@ -63,3 +63,6 @@
  js-rtc-y = rtc.o
  
@@ -8049,7 +8052,7 @@ diff -Naur linux-3.6.7/drivers/char/Makefile linux-3.6.7.patch/drivers/char/Make
 +
 diff -Naur linux-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c linux-3.6.7.patch/drivers/cpufreq/bcm2835-cpufreq.c
 --- linux-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/cpufreq/bcm2835-cpufreq.c	2012-11-18 12:45:10.496331840 +0100
++++ linux-3.6.7.patch/drivers/cpufreq/bcm2835-cpufreq.c	2012-11-18 20:53:35.151715939 +0100
 @@ -0,0 +1,239 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -8292,7 +8295,7 @@ diff -Naur linux-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c linux-3.6.7.patch/drive
 +
 diff -Naur linux-3.6.7/drivers/cpufreq/Kconfig.arm linux-3.6.7.patch/drivers/cpufreq/Kconfig.arm
 --- linux-3.6.7/drivers/cpufreq/Kconfig.arm	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/cpufreq/Kconfig.arm	2012-11-18 12:45:10.519332283 +0100
++++ linux-3.6.7.patch/drivers/cpufreq/Kconfig.arm	2012-11-18 20:53:35.152715958 +0100
 @@ -76,3 +76,12 @@
  	help
  	  This adds the CPUFreq driver for Samsung EXYNOS5250
@@ -8308,7 +8311,7 @@ diff -Naur linux-3.6.7/drivers/cpufreq/Kconfig.arm linux-3.6.7.patch/drivers/cpu
 +
 diff -Naur linux-3.6.7/drivers/cpufreq/Makefile linux-3.6.7.patch/drivers/cpufreq/Makefile
 --- linux-3.6.7/drivers/cpufreq/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/cpufreq/Makefile	2012-11-18 12:45:10.574333361 +0100
++++ linux-3.6.7.patch/drivers/cpufreq/Makefile	2012-11-18 20:53:35.152715958 +0100
 @@ -48,6 +48,7 @@
  obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)	+= exynos4x12-cpufreq.o
  obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o
@@ -8319,7 +8322,7 @@ diff -Naur linux-3.6.7/drivers/cpufreq/Makefile linux-3.6.7.patch/drivers/cpufre
  # PowerPC platform drivers
 diff -Naur linux-3.6.7/drivers/hwmon/bcm2835-hwmon.c linux-3.6.7.patch/drivers/hwmon/bcm2835-hwmon.c
 --- linux-3.6.7/drivers/hwmon/bcm2835-hwmon.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/hwmon/bcm2835-hwmon.c	2012-11-18 12:45:10.581333498 +0100
++++ linux-3.6.7.patch/drivers/hwmon/bcm2835-hwmon.c	2012-11-18 20:53:35.153715977 +0100
 @@ -0,0 +1,219 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -8542,7 +8545,7 @@ diff -Naur linux-3.6.7/drivers/hwmon/bcm2835-hwmon.c linux-3.6.7.patch/drivers/h
 +module_platform_driver(bcm2835_hwmon_driver);
 diff -Naur linux-3.6.7/drivers/hwmon/Kconfig linux-3.6.7.patch/drivers/hwmon/Kconfig
 --- linux-3.6.7/drivers/hwmon/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/hwmon/Kconfig	2012-11-18 12:45:10.739336578 +0100
++++ linux-3.6.7.patch/drivers/hwmon/Kconfig	2012-11-18 20:53:35.154715996 +0100
 @@ -1411,6 +1411,16 @@
          help
            Support for the A/D converter on MC13783 and MC13892 PMIC.
@@ -8562,7 +8565,7 @@ diff -Naur linux-3.6.7/drivers/hwmon/Kconfig linux-3.6.7.patch/drivers/hwmon/Kco
  comment "ACPI drivers"
 diff -Naur linux-3.6.7/drivers/hwmon/Makefile linux-3.6.7.patch/drivers/hwmon/Makefile
 --- linux-3.6.7/drivers/hwmon/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/hwmon/Makefile	2012-11-18 12:45:10.739336578 +0100
++++ linux-3.6.7.patch/drivers/hwmon/Makefile	2012-11-18 20:53:35.154715996 +0100
 @@ -129,6 +129,7 @@
  obj-$(CONFIG_SENSORS_W83L786NG)	+= w83l786ng.o
  obj-$(CONFIG_SENSORS_WM831X)	+= wm831x-hwmon.o
@@ -8573,7 +8576,7 @@ diff -Naur linux-3.6.7/drivers/hwmon/Makefile linux-3.6.7.patch/drivers/hwmon/Ma
  
 diff -Naur linux-3.6.7/drivers/i2c/busses/i2c-bcm2708.c linux-3.6.7.patch/drivers/i2c/busses/i2c-bcm2708.c
 --- linux-3.6.7/drivers/i2c/busses/i2c-bcm2708.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/i2c/busses/i2c-bcm2708.c	2012-11-18 12:45:10.741336618 +0100
++++ linux-3.6.7.patch/drivers/i2c/busses/i2c-bcm2708.c	2012-11-18 20:53:35.155716015 +0100
 @@ -0,0 +1,400 @@
 +/*
 + * Driver for Broadcom BCM2708 BSC Controllers
@@ -8977,7 +8980,7 @@ diff -Naur linux-3.6.7/drivers/i2c/busses/i2c-bcm2708.c linux-3.6.7.patch/driver
 +MODULE_ALIAS("platform:" DRV_NAME);
 diff -Naur linux-3.6.7/drivers/i2c/busses/Kconfig linux-3.6.7.patch/drivers/i2c/busses/Kconfig
 --- linux-3.6.7/drivers/i2c/busses/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/i2c/busses/Kconfig	2012-11-18 12:45:10.742336638 +0100
++++ linux-3.6.7.patch/drivers/i2c/busses/Kconfig	2012-11-18 20:53:35.156716034 +0100
 @@ -314,6 +314,25 @@
  	  This driver can also be built as a module.  If so, the module
  	  will be called i2c-au1550.
@@ -9006,7 +9009,7 @@ diff -Naur linux-3.6.7/drivers/i2c/busses/Kconfig linux-3.6.7.patch/drivers/i2c/
  	depends on BLACKFIN
 diff -Naur linux-3.6.7/drivers/i2c/busses/Makefile linux-3.6.7.patch/drivers/i2c/busses/Makefile
 --- linux-3.6.7/drivers/i2c/busses/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/i2c/busses/Makefile	2012-11-18 12:45:10.742336638 +0100
++++ linux-3.6.7.patch/drivers/i2c/busses/Makefile	2012-11-18 20:53:35.156716034 +0100
 @@ -30,6 +30,7 @@
  # Embedded system I2C/SMBus host controller drivers
  obj-$(CONFIG_I2C_AT91)		+= i2c-at91.o
@@ -9017,7 +9020,7 @@ diff -Naur linux-3.6.7/drivers/i2c/busses/Makefile linux-3.6.7.patch/drivers/i2c
  obj-$(CONFIG_I2C_DAVINCI)	+= i2c-davinci.o
 diff -Naur linux-3.6.7/drivers/misc/Kconfig linux-3.6.7.patch/drivers/misc/Kconfig
 --- linux-3.6.7/drivers/misc/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/Kconfig	2012-11-18 12:45:10.743336658 +0100
++++ linux-3.6.7.patch/drivers/misc/Kconfig	2012-11-18 20:53:35.157716053 +0100
 @@ -517,4 +517,6 @@
  source "drivers/misc/carma/Kconfig"
  source "drivers/misc/altera-stapl/Kconfig"
@@ -9027,7 +9030,7 @@ diff -Naur linux-3.6.7/drivers/misc/Kconfig linux-3.6.7.patch/drivers/misc/Kconf
 +
 diff -Naur linux-3.6.7/drivers/misc/Makefile linux-3.6.7.patch/drivers/misc/Makefile
 --- linux-3.6.7/drivers/misc/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/Makefile	2012-11-18 12:45:10.744336678 +0100
++++ linux-3.6.7.patch/drivers/misc/Makefile	2012-11-18 20:53:35.157716053 +0100
 @@ -50,3 +50,4 @@
  obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
  obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/
@@ -9035,7 +9038,7 @@ diff -Naur linux-3.6.7/drivers/misc/Makefile linux-3.6.7.patch/drivers/misc/Make
 +obj-$(CONFIG_BCM2708_VCHIQ)	+= vc04_services/
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/connection.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h	2012-11-18 12:45:10.745336698 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h	2012-11-18 20:53:35.159716091 +0100
 @@ -0,0 +1,313 @@
 +/*
 + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -9352,7 +9355,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/con
 +/****************************** End of file **********************************/
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h	2012-11-18 12:45:10.746336717 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h	2012-11-18 20:53:35.159716091 +0100
 @@ -0,0 +1,189 @@
 +/*
 + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -9545,7 +9548,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers
 +/****************************** End of file ***********************************/
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h	2012-11-18 12:45:10.747336736 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h	2012-11-18 20:53:35.160716110 +0100
 @@ -0,0 +1,209 @@
 +/*
 + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -9758,7 +9761,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu
 +/****************************** End of file **********************************/
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h	2012-11-18 12:45:10.747336736 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h	2012-11-18 20:53:35.160716110 +0100
 @@ -0,0 +1,56 @@
 +/*
 + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -9818,7 +9821,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern
 +#endif /*VCHI_CFG_INTERNAL_H_*/
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h	2012-11-18 12:45:10.748336754 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h	2012-11-18 20:53:35.161716129 +0100
 @@ -0,0 +1,148 @@
 +/*
 + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -9970,7 +9973,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h l
 +#endif // VCHI_COMMON_H_
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi.h	2012-11-18 12:45:10.749336773 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi.h	2012-11-18 20:53:35.162716148 +0100
 @@ -0,0 +1,355 @@
 +/*
 + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -10329,7 +10332,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.
 +/****************************** End of file **********************************/
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h	2012-11-18 12:45:10.749336773 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h	2012-11-18 20:53:35.162716148 +0100
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom. All rights reserved.
@@ -10360,8 +10363,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux
 +#endif
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	2012-11-18 12:45:10.751336814 +0100
-@@ -0,0 +1,518 @@
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	2012-11-18 20:53:35.163716167 +0100
+@@ -0,0 +1,523 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
 + *
@@ -10672,6 +10675,11 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835
 +{
 +	vchiq_log_info((vchiq_arm_log_level>=VCHIQ_LOG_INFO),"Suspend timer not in use");
 +}
++void
++vchiq_platform_handle_timeout(VCHIQ_STATE_T *state)
++{
++	(void)state;
++}
 +/*
 + * Local functions
 + */
@@ -10882,7 +10890,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835
 +}
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h	2012-11-18 12:45:10.751336814 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h	2012-11-18 20:53:35.164716186 +0100
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
@@ -10913,8 +10921,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835
 +#endif /* VCHIQ_2835_H */
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c	2012-11-18 12:45:10.755336893 +0100
-@@ -0,0 +1,2740 @@
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c	2012-11-18 20:53:35.167716243 +0100
+@@ -0,0 +1,2788 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
 + *
@@ -10971,7 +10979,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +
 +/* Run time control of log level, based on KERN_XXX level. */
 +int vchiq_arm_log_level = VCHIQ_LOG_DEFAULT;
-+int vchiq_susp_log_level = VCHIQ_LOG_DEFAULT;
++int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
 +
 +#define SUSPEND_TIMER_TIMEOUT_MS 100
 +#define SUSPEND_RETRY_TIMER_TIMEOUT_MS 1000
@@ -11352,6 +11360,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +		if (args.is_open) {
 +			if (!instance->connected) {
 +				ret = -ENOTCONN;
++				kfree(user_service);
 +				break;
 +			}
 +			srvstate = VCHIQ_SRVSTATE_OPENING;
@@ -11622,7 +11631,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +		*/
 +		rmb();
 +
-+		if ((ret == 0) && !instance->closing) {
++		if (ret == 0) {
 +			int msgbufcount = args.msgbufcount;
 +			for (ret = 0; ret < args.count; ret++) {
 +				VCHIQ_COMPLETION_DATA_T *completion;
@@ -11989,12 +11998,15 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +			"vchiq_release: instance=%lx",
 +			(unsigned long)instance);
 +
-+		if (state) {
-+			/* Ensure videocore is awake to allow termination. */
-+			vchiq_use_internal(instance->state, NULL,
-+					USE_TYPE_VCHIQ);
++		if (!state) {
++			ret = -EPERM;
++			goto out;
 +		}
 +
++		/* Ensure videocore is awake to allow termination. */
++		vchiq_use_internal(instance->state, NULL,
++				USE_TYPE_VCHIQ);
++
 +		mutex_lock(&instance->completion_mutex);
 +
 +		/* Wake the completion thread and ask it to exit */
@@ -12066,10 +12078,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +			instance->completion_remove++;
 +		}
 +
-+		if (state) {
-+			/* Release the PEER service count. */
-+			vchiq_release_internal(instance->state, NULL);
-+		}
++		/* Release the PEER service count. */
++		vchiq_release_internal(instance->state, NULL);
 +
 +		{
 +			struct list_head *pos, *next;
@@ -12100,6 +12110,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +		ret = -ENXIO;
 +	}
 +
++out:
 +	return ret;
 +}
 +
@@ -12114,7 +12125,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +{
 +	DUMP_CONTEXT_T *context = (DUMP_CONTEXT_T *)dump_context;
 +
-+	if ((context->actual >= 0) && (context->actual < context->space)) {
++	if (context->actual < context->space) {
 +		int copy_bytes;
 +		if (context->offset > 0) {
 +			int skip_bytes = min(len, (int)context->offset);
@@ -12332,8 +12343,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +
 +	vchiq_dump_state(&context, &g_state);
 +
-+	if (context.actual >= 0)
-+		*ppos += context.actual;
++	*ppos += context.actual;
 +
 +	return context.actual;
 +}
@@ -12384,7 +12394,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +		/* non-zero usage count - videocore still required */
 +		return 1;
 +}
-+static VCHIQ_STATUS_T vchiq_keepalive_vchiq_callback(VCHIQ_REASON_T reason,
++
++static VCHIQ_STATUS_T
++vchiq_keepalive_vchiq_callback(VCHIQ_REASON_T reason,
 +	VCHIQ_HEADER_T *header,
 +	VCHIQ_SERVICE_HANDLE_T service_user,
 +	void *bulk_user)
@@ -12475,6 +12487,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +}
 +
 +
++
 +VCHIQ_STATUS_T
 +vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
 +{
@@ -12482,7 +12495,6 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	char threadname[10];
 +
 +	if (arm_state) {
-+		mutex_init(&arm_state->vc_use_cnt_mutex);
 +		rwlock_init(&arm_state->susp_res_lock);
 +
 +		init_completion(&arm_state->ka_evt);
@@ -12689,14 +12701,22 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +block_resume(VCHIQ_ARM_STATE_T *arm_state)
 +{
 +	int status = VCHIQ_SUCCESS;
-+	while (arm_state->blocked_count) {
++	const unsigned long timeout_val =
++				msecs_to_jiffies(FORCE_SUSPEND_TIMEOUT_MS);
++	int resume_count = 0;
++
++	/* Allow any threads which were blocked by the last force suspend to
++	 * complete if they haven't already.  Only give this one shot; if
++	 * blocked_count is incremented after blocked_blocker is completed
++	 * (which only happens when blocked_count hits 0) then those threads
++	 * will have to wait until next time around */
++	if (arm_state->blocked_count) {
 +		INIT_COMPLETION(arm_state->blocked_blocker);
 +		write_unlock_bh(&arm_state->susp_res_lock);
 +		vchiq_log_info(vchiq_susp_log_level, "%s wait for previously "
 +			"blocked clients", __func__);
 +		if (wait_for_completion_interruptible_timeout(
-+				&arm_state->blocked_blocker,
-+				msecs_to_jiffies(FORCE_SUSPEND_TIMEOUT_MS))
++				&arm_state->blocked_blocker, timeout_val)
 +					<= 0) {
 +			vchiq_log_error(vchiq_susp_log_level, "%s wait for "
 +				"previously blocked clients failed" , __func__);
@@ -12708,30 +12728,33 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +			"clients resumed", __func__);
 +		write_lock_bh(&arm_state->susp_res_lock);
 +	}
++
++	/* We need to wait for resume to complete if it's in process */
 +	while (arm_state->vc_resume_state != VC_RESUME_RESUMED &&
 +			arm_state->vc_resume_state > VC_RESUME_IDLE) {
-+		if (!try_wait_for_completion(&arm_state->vc_resume_complete)) {
-+			write_unlock_bh(&arm_state->susp_res_lock);
-+			vchiq_log_info(vchiq_susp_log_level, "%s wait for "
-+				"resume", __func__);
-+			if (wait_for_completion_interruptible_timeout(
-+					&arm_state->vc_resume_complete,
-+					msecs_to_jiffies(
-+						FORCE_SUSPEND_TIMEOUT_MS))
-+							<= 0) {
-+				vchiq_log_error(vchiq_susp_log_level, "%s wait "
-+					"for resume failed (%s)", __func__,
-+					resume_state_names[
-+						arm_state->vc_resume_state +
-+						VC_RESUME_NUM_OFFSET]);
-+				status = VCHIQ_ERROR;
-+				write_lock_bh(&arm_state->susp_res_lock);
-+				goto out;
-+			}
-+			vchiq_log_info(vchiq_susp_log_level, "%s resumed",
-+				__func__);
-+			write_lock_bh(&arm_state->susp_res_lock);
++		if (resume_count > 1) {
++			status = VCHIQ_ERROR;
++			vchiq_log_error(vchiq_susp_log_level, "%s waited too "
++				"many times for resume" , __func__);
++			goto out;
 +		}
++		write_unlock_bh(&arm_state->susp_res_lock);
++		vchiq_log_info(vchiq_susp_log_level, "%s wait for resume",
++			__func__);
++		if (wait_for_completion_interruptible_timeout(
++				&arm_state->vc_resume_complete, timeout_val)
++					<= 0) {
++			vchiq_log_error(vchiq_susp_log_level, "%s wait for "
++				"resume failed (%s)", __func__,
++				resume_state_names[arm_state->vc_resume_state +
++							VC_RESUME_NUM_OFFSET]);
++			status = VCHIQ_ERROR;
++			write_lock_bh(&arm_state->susp_res_lock);
++			goto out;
++		}
++		vchiq_log_info(vchiq_susp_log_level, "%s resumed", __func__);
++		write_lock_bh(&arm_state->susp_res_lock);
++		resume_count++;
 +	}
 +	INIT_COMPLETION(arm_state->resume_blocker);
 +	arm_state->resume_blocked = 1;
@@ -12740,7 +12763,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	return status;
 +}
 +
-+inline static void
++static inline void
 +unblock_resume(VCHIQ_ARM_STATE_T *arm_state)
 +{
 +	complete_all(&arm_state->resume_blocker);
@@ -12782,7 +12805,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +		/* fall through */
 +	case VC_SUSPEND_REJECTED:
 +	case VC_SUSPEND_FAILED:
-+		INIT_COMPLETION(arm_state->vc_suspend_complete);
++		/* Ensure any idle state actions have been run */
++		set_suspend_state(arm_state, VC_SUSPEND_IDLE);
 +		/* fall through */
 +	case VC_SUSPEND_IDLE:
 +		vchiq_log_info(vchiq_susp_log_level,
@@ -12826,6 +12850,40 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +}
 +
 +
++static void
++output_timeout_error(VCHIQ_STATE_T *state)
++{
++	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
++	char service_err[50] = "";
++	int vc_use_count = arm_state->videocore_use_count;
++	int active_services = state->unused_service;
++	int i;
++
++	if (!arm_state->videocore_use_count) {
++		snprintf(service_err, 50, " Videocore usecount is 0");
++		goto output_msg;
++	}
++	for (i = 0; i < active_services; i++) {
++		VCHIQ_SERVICE_T *service_ptr = state->services[i];
++		if (service_ptr && service_ptr->service_use_count &&
++			(service_ptr->srvstate != VCHIQ_SRVSTATE_FREE)) {
++			snprintf(service_err, 50, " %c%c%c%c(%d) service has "
++				"use count %d%s", VCHIQ_FOURCC_AS_4CHARS(
++					service_ptr->base.fourcc),
++				 service_ptr->client_id,
++				 service_ptr->service_use_count,
++				 service_ptr->service_use_count ==
++					 vc_use_count ? "" : " (+ more)");
++			break;
++		}
++	}
++
++output_msg:
++	vchiq_log_error(vchiq_susp_log_level,
++		"timed out waiting for vc suspend (%d).%s",
++		 arm_state->autosuspend_override, service_err);
++
++}
 +
 +/* Try to get videocore into suspended state, regardless of autosuspend state.
 +** We don't actually force suspend, since videocore may get into a bad state
@@ -12843,7 +12901,6 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	VCHIQ_STATUS_T status = VCHIQ_ERROR;
 +	long rc = 0;
 +	int repeat = -1;
-+	static int autosuspend_override;
 +
 +	if (!arm_state)
 +		goto out;
@@ -12856,11 +12913,11 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	if (status != VCHIQ_SUCCESS)
 +		goto unlock;
 +	if (arm_state->vc_suspend_state == VC_SUSPEND_SUSPENDED) {
-+			/* Already suspended - just block resume and exit */
-+			vchiq_log_info(vchiq_susp_log_level, "%s already "
-+				"suspended", __func__);
-+			status = VCHIQ_SUCCESS;
-+			goto unlock;
++		/* Already suspended - just block resume and exit */
++		vchiq_log_info(vchiq_susp_log_level, "%s already suspended",
++			__func__);
++		status = VCHIQ_SUCCESS;
++		goto unlock;
 +	} else if (arm_state->vc_suspend_state <= VC_SUSPEND_IDLE) {
 +		/* initiate suspend immediately in the case that we're waiting
 +		 * for the timeout */
@@ -12869,14 +12926,14 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +			vchiq_log_info(vchiq_susp_log_level, "%s videocore "
 +				"idle, initiating suspend", __func__);
 +			status = vchiq_arm_vcsuspend(state);
-+		} else if (autosuspend_override < FORCE_SUSPEND_FAIL_MAX) {
++		} else if (arm_state->autosuspend_override <
++						FORCE_SUSPEND_FAIL_MAX) {
 +			vchiq_log_info(vchiq_susp_log_level, "%s letting "
 +				"videocore go idle", __func__);
 +			status = VCHIQ_SUCCESS;
 +		} else {
 +			vchiq_log_warning(vchiq_susp_log_level, "%s failed too "
-+				"many times - no more Mr Nice Guy... "
-+				"initiating suspend", __func__);
++				"many times - attempting suspend", __func__);
 +			status = vchiq_arm_vcsuspend(state);
 +		}
 +	} else {
@@ -12886,40 +12943,37 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	}
 +
 +	/* Wait for suspend to happen due to system idle (not forced..) */
-+	if (status == VCHIQ_SUCCESS) {
-+		do {
-+			write_unlock_bh(&arm_state->susp_res_lock);
++	if (status != VCHIQ_SUCCESS)
++		goto unblock_resume;
 +
-+			rc = wait_for_completion_interruptible_timeout(
++	do {
++		write_unlock_bh(&arm_state->susp_res_lock);
++
++		rc = wait_for_completion_interruptible_timeout(
 +				&arm_state->vc_suspend_complete,
 +				msecs_to_jiffies(FORCE_SUSPEND_TIMEOUT_MS));
 +
-+			write_lock_bh(&arm_state->susp_res_lock);
-+			if (rc < 0) {
-+				vchiq_log_warning(vchiq_susp_log_level, "%s "
-+					"interrupted waiting for suspend",
-+					__func__);
-+				status = VCHIQ_ERROR;
-+				goto unblock_resume;
-+			} else if (rc == 0) {
-+				if (arm_state->vc_suspend_state >
-+							VC_SUSPEND_IDLE) {
-+					/* Repeat timeout once if in progress */
-+					if (repeat < 0) {
-+						repeat = 1;
-+						continue;
-+					}
++		write_lock_bh(&arm_state->susp_res_lock);
++		if (rc < 0) {
++			vchiq_log_warning(vchiq_susp_log_level, "%s "
++				"interrupted waiting for suspend", __func__);
++			status = VCHIQ_ERROR;
++			goto unblock_resume;
++		} else if (rc == 0) {
++			if (arm_state->vc_suspend_state > VC_SUSPEND_IDLE) {
++				/* Repeat timeout once if in progress */
++				if (repeat < 0) {
++					repeat = 1;
++					continue;
 +				}
-+				autosuspend_override++;
-+				vchiq_log_warning(vchiq_susp_log_level,
-+					"%s timed out waiting for vc suspend "
-+					"(%d)", __func__, autosuspend_override);
-+				status = VCHIQ_RETRY;
-+				goto unblock_resume;
 +			}
-+		} while (0 < (repeat--));
-+	} else
-+		goto unblock_resume;
++			arm_state->autosuspend_override++;
++			output_timeout_error(state);
++
++			status = VCHIQ_RETRY;
++			goto unblock_resume;
++		}
++	} while (0 < (repeat--));
 +
 +	/* Check and report state in case we need to abort ARM suspend */
 +	if (arm_state->vc_suspend_state != VC_SUSPEND_SUSPENDED) {
@@ -12936,8 +12990,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +		goto unblock_resume;
 +	}
 +
-+	/* successfully suspended - reset override counter, unlock and exit */
-+	autosuspend_override = 0;
++	/* successfully suspended - unlock and exit */
 +	goto unlock;
 +
 +unblock_resume:
@@ -12994,8 +13047,14 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	write_unlock_bh(&arm_state->susp_res_lock);
 +
 +	if (resume) {
-+		wait_for_completion_interruptible(
-+					&arm_state->vc_resume_complete);
++		if (wait_for_completion_interruptible(
++			&arm_state->vc_resume_complete) < 0) {
++			vchiq_log_error(vchiq_susp_log_level,
++				"%s interrupted", __func__);
++			/* failed, cannot accurately derive suspend
++			 * state, so exit early. */
++			goto out;
++		}
 +	}
 +
 +	read_lock_bh(&arm_state->susp_res_lock);
@@ -13097,8 +13156,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +
 +	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
 +
-+	if (use_type != USE_TYPE_SERVICE) {
-+		sprintf(entity, "PEER:   ");
++	if (use_type == USE_TYPE_VCHIQ) {
++		sprintf(entity, "VCHIQ:   ");
 +		entity_uc = &arm_state->peer_use_count;
 +	} else if (service) {
 +		sprintf(entity, "%c%c%c%c:%03d",
@@ -13155,18 +13214,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	}
 +
 +	stop_suspend_timer(arm_state);
-+	write_unlock_bh(&arm_state->susp_res_lock);
-+
-+	mutex_lock(&arm_state->vc_use_cnt_mutex);
-+	if (!arm_state->videocore_use_count)
-+		pm_qos_add_request(&arm_state->qos_request,
-+					PM_QOS_CPU_DMA_LATENCY, 100);
 +
 +	local_uc = ++arm_state->videocore_use_count;
 +	local_entity_uc = ++(*entity_uc);
-+	mutex_unlock(&arm_state->vc_use_cnt_mutex);
-+
-+	write_lock_bh(&arm_state->susp_res_lock);
 +
 +	/* If there's a pending request which hasn't yet been serviced then
 +	 * just clear it.  If we're past VC_SUSPEND_REQUESTED state then
@@ -13175,7 +13225,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	if (arm_state->vc_suspend_state <= VC_SUSPEND_REQUESTED)
 +		set_suspend_state(arm_state, VC_SUSPEND_IDLE);
 +
-+	if (need_resume(state)) {
++	if ((use_type != USE_TYPE_SERVICE_NO_RESUME) && need_resume(state)) {
 +		set_resume_state(arm_state, VC_RESUME_REQUESTED);
 +		vchiq_log_info(vchiq_susp_log_level,
 +			"%s %s count %d, state count %d",
@@ -13256,17 +13306,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +		ret = VCHIQ_ERROR;
 +		goto unlock;
 +	}
-+	write_unlock_bh(&arm_state->susp_res_lock);
-+
-+	mutex_lock(&arm_state->vc_use_cnt_mutex);
 +	local_uc = --arm_state->videocore_use_count;
 +	local_entity_uc = --(*entity_uc);
 +
-+	if (!arm_state->videocore_use_count)
-+		pm_qos_remove_request(&arm_state->qos_request);
-+	mutex_unlock(&arm_state->vc_use_cnt_mutex);
-+
-+	write_lock_bh(&arm_state->susp_res_lock);
 +	if (!vchiq_videocore_wanted(state)) {
 +		if (vchiq_platform_use_suspend_timer() &&
 +				!arm_state->resume_blocked) {
@@ -13338,6 +13380,19 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +}
 +
 +VCHIQ_STATUS_T
++vchiq_use_service_no_resume(VCHIQ_SERVICE_HANDLE_T handle)
++{
++	VCHIQ_STATUS_T ret = VCHIQ_ERROR;
++	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
++	if (service) {
++		ret = vchiq_use_internal(service->state, service,
++				USE_TYPE_SERVICE_NO_RESUME);
++		unlock_service(service);
++	}
++	return ret;
++}
++
++VCHIQ_STATUS_T
 +vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
 +{
 +	VCHIQ_STATUS_T ret = VCHIQ_ERROR;
@@ -13429,7 +13484,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +			local_max_services);
 +
 +	for (i = 0; i < j; i++) {
-+		vchiq_log_error(vchiq_arm_log_level,
++		vchiq_log_warning(vchiq_susp_log_level,
 +			"----- %c%c%c%c:%d service count %d %s",
 +			VCHIQ_FOURCC_AS_4CHARS(service_data[i].fourcc),
 +			service_data[i].clientid,
@@ -13437,7 +13492,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +			service_data[i].use_count ? nz : "");
 +	}
 +	vchiq_log_warning(vchiq_susp_log_level,
-+		"----- PEER use count count %d", peer_count);
++		"----- VCHIQ use count count %d", peer_count);
 +	vchiq_log_warning(vchiq_susp_log_level,
 +		"--- Overall vchiq instance use count %d", vc_use_count);
 +
@@ -13447,15 +13502,16 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +VCHIQ_STATUS_T
 +vchiq_check_service(VCHIQ_SERVICE_T *service)
 +{
-+	VCHIQ_ARM_STATE_T *arm_state =
-+		vchiq_platform_get_arm_state(service->state);
++	VCHIQ_ARM_STATE_T *arm_state;
 +	VCHIQ_STATUS_T ret = VCHIQ_ERROR;
 +
-+	if (!arm_state || !service)
++	if (!service || !service->state)
 +		goto out;
 +
 +	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
 +
++	arm_state = vchiq_platform_get_arm_state(service->state);
++
 +	read_lock_bh(&arm_state->susp_res_lock);
 +	if (service->service_use_count)
 +		ret = VCHIQ_SUCCESS;
@@ -13657,8 +13713,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +MODULE_AUTHOR("Broadcom Corporation");
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h	2012-11-18 12:45:10.755336893 +0100
-@@ -0,0 +1,201 @@
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h	2012-11-18 20:53:35.168716262 +0100
+@@ -0,0 +1,197 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
 + *
@@ -13682,10 +13738,6 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +
 +#include <linux/mutex.h>
 +#include <linux/semaphore.h>
-+//#include <linux/pm_qos_params.h>
-+#define pm_qos_add_request(a,b,c) do {} while (0)
-+#define pm_qos_remove_request(a) do {} while (0)
-+struct pm_qos_request_list {int dummy;};
 +#include <linux/atomic.h>
 +#include "vchiq_core.h"
 +
@@ -13711,11 +13763,12 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +
 +enum USE_TYPE_E {
 +	USE_TYPE_SERVICE,
-+	USE_TYPE_PEER,
++	USE_TYPE_SERVICE_NO_RESUME,
 +	USE_TYPE_VCHIQ
 +};
 +
 +
++
 +typedef struct vchiq_arm_state_struct {
 +	/* Keepalive-related data */
 +	struct task_struct *ka_thread;
@@ -13731,7 +13784,6 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	enum vc_suspend_status vc_suspend_state;
 +	enum vc_resume_status vc_resume_state;
 +
-+	struct mutex vc_use_cnt_mutex;
 +	unsigned int wake_address;
 +
 +	struct timer_list suspend_timer;
@@ -13758,14 +13810,14 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +	struct completion blocked_blocker;
 +	int blocked_count;
 +
++	int autosuspend_override;
++
 +	/* Flag to indicate that the first vchiq connect has made it through.
 +	** This means that both sides should be fully ready, and we should
 +	** be able to suspend after this point.
 +	*/
 +	int first_connect;
 +
-+	struct pm_qos_request_list qos_request;
-+
 +	unsigned long long suspend_start_time;
 +	unsigned long long sleep_start_time;
 +	unsigned long long resume_start_time;
@@ -13862,7 +13914,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.
 +#endif /* VCHIQ_ARM_H */
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h	2012-11-18 12:45:10.756336912 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h	2012-11-18 20:53:35.168716262 +0100
 @@ -0,0 +1,22 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom. All rights reserved.
@@ -13888,7 +13940,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_buil
 +const char *vchiq_get_build_date(void);
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h	2012-11-18 12:45:10.756336912 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h	2012-11-18 20:53:35.169716281 +0100
 @@ -0,0 +1,45 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
@@ -13937,7 +13989,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.
 +#endif /* VCHIQ_CFG_H */
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c	2012-11-18 12:45:10.757336931 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c	2012-11-18 20:53:35.169716281 +0100
 @@ -0,0 +1,100 @@
 +/*****************************************************************************
 +* Copyright 2001 - 2010 Broadcom Corporation.  All rights reserved.
@@ -14041,7 +14093,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn
 +EXPORT_SYMBOL(vchiq_add_connected_callback);
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h	2012-11-18 12:45:10.757336931 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h	2012-11-18 20:53:35.170716300 +0100
 @@ -0,0 +1,32 @@
 +/*****************************************************************************
 +* Copyright 2001 - 2010 Broadcom Corporation.  All rights reserved.
@@ -14077,8 +14129,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn
 +
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c	2012-11-18 12:45:10.762337029 +0100
-@@ -0,0 +1,3613 @@
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c	2012-11-18 20:53:35.174716376 +0100
+@@ -0,0 +1,3676 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
 + *
@@ -14176,7 +14228,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +	"PAUSING",
 +	"PAUSE_SENT",
 +	"PAUSED",
-+	"RESUMING"
++	"RESUMING",
++	"PAUSE_TIMEOUT",
++	"RESUME_TIMEOUT"
 +};
 +
 +
@@ -14328,8 +14382,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +		if (!service->ref_count) {
 +			BUG_ON(service->srvstate != VCHIQ_SRVSTATE_FREE);
 +			state->services[service->localport] = NULL;
-+		}
-+		else
++		} else
 +			service = NULL;
 +	}
 +	spin_unlock(&service_spinlock);
@@ -14389,14 +14442,22 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason,
 +	VCHIQ_HEADER_T *header, void *bulk_userdata)
 +{
++	VCHIQ_STATUS_T status;
 +	vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %x, %x)",
 +		service->state->id, service->localport, reason_names[reason],
 +		(unsigned int)header, (unsigned int)bulk_userdata);
-+	return service->base.callback(reason, header, service->handle,
++	status = service->base.callback(reason, header, service->handle,
 +		bulk_userdata);
++	if (status == VCHIQ_ERROR) {
++		vchiq_log_warning(vchiq_core_log_level,
++			"%d: ignoring ERROR from callback to service %x",
++			service->state->id, service->handle);
++		status = VCHIQ_SUCCESS;
++	}
++	return status;
 +}
 +
-+static inline void
++inline void
 +vchiq_set_conn_state(VCHIQ_STATE_T *state, VCHIQ_CONNSTATE_T newstate)
 +{
 +	VCHIQ_CONNSTATE_T oldstate = state->conn_state;
@@ -15235,7 +15296,6 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +						reason,	NULL, bulk->userdata);
 +					if (status == VCHIQ_RETRY)
 +						break;
-+					status = VCHIQ_SUCCESS;
 +				}
 +			}
 +
@@ -15306,6 +15366,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +{
 +	VCHIQ_STATE_T *state = service->state;
 +	int resolved = 0;
++	int rc;
 +
 +	while ((queue->process != queue->local_insert) &&
 +		(queue->process != queue->remote_insert)) {
@@ -15321,7 +15382,10 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +		WARN_ON(!((int)(queue->local_insert - queue->process) > 0));
 +		WARN_ON(!((int)(queue->remote_insert - queue->process) > 0));
 +
-+		mutex_lock(&state->bulk_transfer_mutex);
++		rc = mutex_lock_interruptible(&state->bulk_transfer_mutex);
++		if (rc != 0)
++			break;
++
 +		vchiq_transfer_bulk(bulk);
 +		mutex_unlock(&state->bulk_transfer_mutex);
 +
@@ -15479,6 +15543,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +					service->version, service->version_min,
 +					version, version_min);
 +				vchiq_loud_error_footer();
++				unlock_service(service);
 +				goto fail_open;
 +			}
 +			if (service->srvstate == VCHIQ_SRVSTATE_LISTENING) {
@@ -15759,7 +15824,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +				if (state->conn_state ==
 +					VCHIQ_CONNSTATE_CONNECTED) {
 +					DEBUG_TRACE(PARSE_LINE);
-+					resolved = resolve_bulks(service, queue);
++					resolved = resolve_bulks(service,
++						queue);
 +				}
 +
 +				mutex_unlock(&service->bulk_mutex);
@@ -15985,6 +16051,11 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +					BUG();
 +				}
 +				break;
++
++			case VCHIQ_CONNSTATE_PAUSE_TIMEOUT:
++			case VCHIQ_CONNSTATE_RESUME_TIMEOUT:
++				vchiq_platform_handle_timeout(state);
++				break;
 +			default:
 +				break;
 +			}
@@ -16662,16 +16733,25 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +	case VCHIQ_SRVSTATE_OPEN:
 +	case VCHIQ_SRVSTATE_CLOSESENT:
 +	case VCHIQ_SRVSTATE_CLOSERECVD:
-+		if (is_server)
-+			newstate = (service->auto_close ?
-+				VCHIQ_SRVSTATE_LISTENING :
-+				VCHIQ_SRVSTATE_CLOSEWAIT);
-+		else
++		if (is_server) {
++			if (service->auto_close) {
++				service->client_id = 0;
++				service->remoteport = VCHIQ_PORT_FREE;
++				newstate = VCHIQ_SRVSTATE_LISTENING;
++			} else
++				newstate = VCHIQ_SRVSTATE_CLOSEWAIT;
++		} else
 +			newstate = VCHIQ_SRVSTATE_CLOSED;
 +		vchiq_set_service_state(service, newstate);
 +		break;
-+	default:
++	case VCHIQ_SRVSTATE_LISTENING:
 +		break;
++	default:
++		vchiq_log_error(vchiq_core_log_level,
++			"close_service_complete(%x) called in state %s",
++			service->handle, srvstate_names[service->srvstate]);
++		WARN(1, "close_service_complete in unexpected state\n");
++		return VCHIQ_ERROR;
 +	}
 +
 +	status = make_service_callback(service,
@@ -16687,14 +16767,11 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +			vchiq_release_service_internal(service);
 +
 +		service->client_id = 0;
-+		if (status == VCHIQ_ERROR)
-+			/* Signal an error (fatal, since the other end
-+			** will probably have closed) */
-+			vchiq_set_service_state(service, VCHIQ_SRVSTATE_OPEN);
++		service->remoteport = VCHIQ_PORT_FREE;
 +
 +		if (service->srvstate == VCHIQ_SRVSTATE_CLOSED)
 +			vchiq_free_service_internal(service);
-+		else {
++		else if (service->srvstate != VCHIQ_SRVSTATE_CLOSEWAIT) {
 +			if (is_server)
 +				service->closing = 0;
 +
@@ -16712,6 +16789,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +{
 +	VCHIQ_STATE_T *state = service->state;
 +	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
++	int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID);
 +
 +	vchiq_log_info(vchiq_core_log_level, "%d: csi:%d,%d (%s)",
 +		service->state->id, service->localport, close_recvd,
@@ -16727,7 +16805,19 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +				"vchiq_close_service_internal(1) called "
 +				"in state %s",
 +				srvstate_names[service->srvstate]);
-+		else
++		else if (is_server) {
++			if (service->srvstate == VCHIQ_SRVSTATE_LISTENING) {
++				status = VCHIQ_ERROR;
++			} else {
++				service->client_id = 0;
++				service->remoteport = VCHIQ_PORT_FREE;
++				if (service->srvstate ==
++					VCHIQ_SRVSTATE_CLOSEWAIT)
++					vchiq_set_service_state(service,
++						VCHIQ_SRVSTATE_LISTENING);
++			}
++			up(&service->remove_event);
++		} else
 +			vchiq_free_service_internal(service);
 +		break;
 +	case VCHIQ_SRVSTATE_OPENING:
@@ -16798,8 +16888,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +		break;
 +
 +	case VCHIQ_SRVSTATE_CLOSERECVD:
-+		if (!close_recvd &&
-+			(service->public_fourcc != VCHIQ_FOURCC_INVALID))
++		if (!close_recvd && is_server)
 +			/* Force into LISTENING mode */
 +			vchiq_set_service_state(service,
 +				VCHIQ_SRVSTATE_LISTENING);
@@ -16965,7 +17054,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +{
 +	/* Unregister the service */
 +	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
-+	VCHIQ_STATUS_T status = VCHIQ_ERROR;
++	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
 +
 +	if (!service)
 +		return VCHIQ_ERROR;
@@ -16974,10 +17063,23 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +		"%d: close_service:%d",
 +		service->state->id, service->localport);
 +
++	if ((service->srvstate == VCHIQ_SRVSTATE_FREE) ||
++		(service->srvstate == VCHIQ_SRVSTATE_LISTENING) ||
++		(service->srvstate == VCHIQ_SRVSTATE_HIDDEN)) {
++		unlock_service(service);
++		return VCHIQ_ERROR;
++	}
++
 +	mark_service_closing(service);
 +
++	if (current == service->state->slot_handler_thread) {
++		status = vchiq_close_service_internal(service,
++			0/*!close_recvd*/);
++		BUG_ON(status == VCHIQ_RETRY);
++	} else {
 +	/* Mark the service for termination by the slot handler */
-+	request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
++		request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
++	}
 +
 +	while (1) {
 +		if (down_interruptible(&service->remove_event) != 0) {
@@ -17020,15 +17122,26 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +		"%d: remove_service:%d",
 +		service->state->id, service->localport);
 +
++	if (service->srvstate == VCHIQ_SRVSTATE_FREE) {
++		unlock_service(service);
++		return VCHIQ_ERROR;
++	}
++
 +	/* Make it look like a client, because it must be removed and not
 +	   left in the LISTENING state. */
 +	service->public_fourcc = VCHIQ_FOURCC_INVALID;
 +
 +	mark_service_closing(service);
 +
-+	/* Mark the service for termination by the slot handler */
-+	request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
-+
++	if ((service->srvstate == VCHIQ_SRVSTATE_HIDDEN) ||
++		(current == service->state->slot_handler_thread)) {
++		status = vchiq_close_service_internal(service,
++			0/*!close_recvd*/);
++		BUG_ON(status == VCHIQ_RETRY);
++	} else {
++		/* Mark the service for termination by the slot handler */
++		request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
++	}
 +	while (1) {
 +		if (down_interruptible(&service->remove_event) != 0) {
 +			status = VCHIQ_RETRY;
@@ -17054,6 +17167,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +	return status;
 +}
 +
++
 +/* This function may be called by kernel threads or user threads.
 + * User threads may receive VCHIQ_RETRY to indicate that a signal has been
 + * received and the call should be retried after being returned to user
@@ -17476,9 +17590,10 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +	}
 +
 +	len = snprintf(buf, sizeof(buf),
-+		"  Slots: %d available (%d data), %d recyclable, %d stalls (%d data)",
-+		state->slot_queue_available -
-+			SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos),
++		"  Slots: %d available (%d data), %d recyclable, %d stalls "
++		"(%d data)",
++		((state->slot_queue_available * VCHIQ_SLOT_SIZE) -
++			state->local_tx_pos) / VCHIQ_SLOT_SIZE,
 +		state->data_quota - state->data_use_count,
 +		state->local->slot_queue_recycle - state->slot_queue_available,
 +		state->stats.slot_stalls, state->stats.data_stalls);
@@ -17694,8 +17809,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +}
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h	2012-11-18 12:45:10.763337048 +0100
-@@ -0,0 +1,673 @@
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h	2012-11-18 20:53:35.176716414 +0100
+@@ -0,0 +1,682 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
 + *
@@ -17889,7 +18004,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +	VCHIQ_CONNSTATE_PAUSING,
 +	VCHIQ_CONNSTATE_PAUSE_SENT,
 +	VCHIQ_CONNSTATE_PAUSED,
-+	VCHIQ_CONNSTATE_RESUMING
++	VCHIQ_CONNSTATE_RESUMING,
++	VCHIQ_CONNSTATE_PAUSE_TIMEOUT,
++	VCHIQ_CONNSTATE_RESUME_TIMEOUT
 +} VCHIQ_CONNSTATE_T;
 +
 +enum {
@@ -18365,13 +18482,20 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core
 +	VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate);
 +
 +extern void
++vchiq_platform_handle_timeout(VCHIQ_STATE_T *state);
++
++extern void
++vchiq_set_conn_state(VCHIQ_STATE_T *state, VCHIQ_CONNSTATE_T newstate);
++
++
++extern void
 +vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
 +	size_t numBytes);
 +
 +#endif
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion	2012-11-18 12:45:10.764337068 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion	2012-11-18 20:53:35.176716414 +0100
 @@ -0,0 +1,87 @@
 +#!/usr/bin/perl -w
 +
@@ -18462,7 +18586,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv
 +EOF
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h	2012-11-18 12:45:10.764337068 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h	2012-11-18 20:53:35.176716414 +0100
 @@ -0,0 +1,26 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom. All rights reserved.
@@ -18492,8 +18616,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li
 +
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h	2012-11-18 12:45:10.765337087 +0100
-@@ -0,0 +1,165 @@
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h	2012-11-18 20:53:35.177716433 +0100
+@@ -0,0 +1,167 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
 + *
@@ -18617,6 +18741,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
 +extern VCHIQ_STATUS_T vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);
 +extern VCHIQ_STATUS_T vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);
 +extern VCHIQ_STATUS_T vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
++extern VCHIQ_STATUS_T vchiq_use_service_no_resume(
++	VCHIQ_SERVICE_HANDLE_T service);
 +extern VCHIQ_STATUS_T vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
 +
 +extern VCHIQ_STATUS_T vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T service,
@@ -18661,7 +18787,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
 +#endif /* VCHIQ_IF_H */
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h	2012-11-18 12:45:10.766337107 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h	2012-11-18 20:53:35.178716452 +0100
 @@ -0,0 +1,114 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
@@ -18779,7 +18905,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct
 +#endif
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c	2012-11-18 12:45:10.766337107 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c	2012-11-18 20:53:35.178716452 +0100
 @@ -0,0 +1,424 @@
 +/*****************************************************************************
 +* Copyright 2001 - 2011 Broadcom Corporation.  All rights reserved.
@@ -18894,6 +19020,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern
 +
 +	mutex_unlock(&state->mutex);
 +
++	vchiq_log_trace(vchiq_core_log_level,
++		"%s(%p): returning %d", __func__, instance, status);
++
 +	if (status == VCHIQ_SUCCESS) {
 +		struct list_head *pos, *next;
 +		list_for_each_safe(pos, next,
@@ -18912,9 +19041,6 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern
 +		kfree(instance);
 +	}
 +
-+	vchiq_log_trace(vchiq_core_log_level,
-+		"%s(%p): returning %d", __func__, instance, status);
-+
 +	return status;
 +}
 +EXPORT_SYMBOL(vchiq_shutdown);
@@ -19207,7 +19333,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern
 +}
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h	2012-11-18 12:45:10.767337126 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h	2012-11-18 20:53:35.179716471 +0100
 @@ -0,0 +1,52 @@
 +/*****************************************************************************
 +* Copyright 2001 - 2010 Broadcom Corporation.  All rights reserved.
@@ -19263,7 +19389,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd
 +#endif
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h	2012-11-18 12:45:10.767337126 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h	2012-11-18 20:53:35.179716471 +0100
 @@ -0,0 +1,43 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
@@ -19310,8 +19436,8 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page
 +#endif /* VCHIQ_PAGELIST_H */
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c	2012-11-18 12:45:10.768337146 +0100
-@@ -0,0 +1,223 @@
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c	2012-11-18 20:53:35.180716490 +0100
+@@ -0,0 +1,225 @@
 +/*
 + * Copyright (c) 2012 Broadcom Corporation. All rights reserved.
 + *
@@ -19446,6 +19572,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc
 +	{ "core", &vchiq_core_log_level },
 +	{ "msg",  &vchiq_core_msg_log_level },
 +	{ "sync", &vchiq_sync_log_level },
++	{ "susp", &vchiq_susp_log_level },
 +	{ "arm",  &vchiq_arm_log_level },
 +};
 +static int n_log_entries =
@@ -19535,9 +19662,10 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc
 +{
 +	return proc_info.clients;
 +}
++
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c	2012-11-18 12:45:10.770337185 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c	2012-11-18 20:53:35.181716508 +0100
 @@ -0,0 +1,787 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
@@ -20328,7 +20456,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim
 +EXPORT_SYMBOL(vchi_service_release);
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c	2012-11-18 12:45:10.770337185 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c	2012-11-18 20:53:35.182716527 +0100
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
@@ -20437,7 +20565,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util
 +}
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h	2012-11-18 12:45:10.771337204 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h	2012-11-18 20:53:35.182716527 +0100
 @@ -0,0 +1,67 @@
 +/*
 + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
@@ -20508,7 +20636,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util
 +
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
 --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c	2012-11-18 12:45:10.771337204 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c	2012-11-18 20:53:35.183716546 +0100
 @@ -0,0 +1,27 @@
 +#include "vchiq_build_info.h"
 +#include <linux/broadcom/vc_debug_sym.h>
@@ -20539,7 +20667,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers
 +}
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/Kconfig linux-3.6.7.patch/drivers/misc/vc04_services/Kconfig
 --- linux-3.6.7/drivers/misc/vc04_services/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/Kconfig	2012-11-18 12:45:10.771337204 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/Kconfig	2012-11-18 20:53:35.183716546 +0100
 @@ -0,0 +1,10 @@
 +config BCM2708_VCHIQ
 +	tristate "Videocore VCHIQ"
@@ -20553,7 +20681,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/Kconfig linux-3.6.7.patch/driv
 +
 diff -Naur linux-3.6.7/drivers/misc/vc04_services/Makefile linux-3.6.7.patch/drivers/misc/vc04_services/Makefile
 --- linux-3.6.7/drivers/misc/vc04_services/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/misc/vc04_services/Makefile	2012-11-18 12:45:10.772337224 +0100
++++ linux-3.6.7.patch/drivers/misc/vc04_services/Makefile	2012-11-18 20:53:35.184716565 +0100
 @@ -0,0 +1,18 @@
 +ifeq ($(CONFIG_MACH_BCM2708),y)
 +
@@ -20575,7 +20703,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/Makefile linux-3.6.7.patch/dri
 +
 diff -Naur linux-3.6.7/drivers/mmc/card/block.c linux-3.6.7.patch/drivers/mmc/card/block.c
 --- linux-3.6.7/drivers/mmc/card/block.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/mmc/card/block.c	2012-11-18 12:45:10.773337243 +0100
++++ linux-3.6.7.patch/drivers/mmc/card/block.c	2012-11-18 20:53:35.185716584 +0100
 @@ -1135,7 +1135,7 @@
  			brq->data.blocks = 1;
  	}
@@ -20587,7 +20715,7 @@ diff -Naur linux-3.6.7/drivers/mmc/card/block.c linux-3.6.7.patch/drivers/mmc/ca
  		 */
 diff -Naur linux-3.6.7/drivers/mmc/host/Kconfig linux-3.6.7.patch/drivers/mmc/host/Kconfig
 --- linux-3.6.7/drivers/mmc/host/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/mmc/host/Kconfig	2012-11-18 12:45:10.774337263 +0100
++++ linux-3.6.7.patch/drivers/mmc/host/Kconfig	2012-11-18 20:53:35.186716603 +0100
 @@ -229,6 +229,27 @@
  
  	  YMMV.
@@ -20618,7 +20746,7 @@ diff -Naur linux-3.6.7/drivers/mmc/host/Kconfig linux-3.6.7.patch/drivers/mmc/ho
  	depends on ARCH_OMAP
 diff -Naur linux-3.6.7/drivers/mmc/host/Makefile linux-3.6.7.patch/drivers/mmc/host/Makefile
 --- linux-3.6.7/drivers/mmc/host/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/mmc/host/Makefile	2012-11-18 12:45:10.774337263 +0100
++++ linux-3.6.7.patch/drivers/mmc/host/Makefile	2012-11-18 20:53:35.186716603 +0100
 @@ -13,6 +13,7 @@
  obj-$(CONFIG_MMC_SDHCI_PXAV2)	+= sdhci-pxav2.o
  obj-$(CONFIG_MMC_SDHCI_S3C)	+= sdhci-s3c.o
@@ -20629,7 +20757,7 @@ diff -Naur linux-3.6.7/drivers/mmc/host/Makefile linux-3.6.7.patch/drivers/mmc/h
  obj-$(CONFIG_MMC_OMAP)		+= omap.o
 diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-3.6.7.patch/drivers/mmc/host/sdhci-bcm2708.c
 --- linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/mmc/host/sdhci-bcm2708.c	2012-11-18 12:45:10.776337302 +0100
++++ linux-3.6.7.patch/drivers/mmc/host/sdhci-bcm2708.c	2012-11-18 20:53:35.188716641 +0100
 @@ -0,0 +1,1406 @@
 +/*
 + * sdhci-bcm2708.c Support for SDHCI device on BCM2708
@@ -22039,7 +22167,7 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-3.6.7.patch/driver
 +
 diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.c linux-3.6.7.patch/drivers/mmc/host/sdhci.c
 --- linux-3.6.7/drivers/mmc/host/sdhci.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/mmc/host/sdhci.c	2012-11-18 12:46:55.770377168 +0100
++++ linux-3.6.7.patch/drivers/mmc/host/sdhci.c	2012-11-18 20:54:37.925908084 +0100
 @@ -28,6 +28,7 @@
  #include <linux/mmc/mmc.h>
  #include <linux/mmc/host.h>
@@ -22912,7 +23040,7 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.c linux-3.6.7.patch/drivers/mmc/ho
  	sdhci_disable_card_detection(host);
 diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.h linux-3.6.7.patch/drivers/mmc/host/sdhci.h
 --- linux-3.6.7/drivers/mmc/host/sdhci.h	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/mmc/host/sdhci.h	2012-11-18 12:45:10.781337399 +0100
++++ linux-3.6.7.patch/drivers/mmc/host/sdhci.h	2012-11-18 20:53:35.194716755 +0100
 @@ -275,6 +275,20 @@
  	void	(*platform_reset_enter)(struct sdhci_host *host, u8 mask);
  	void	(*platform_reset_exit)(struct sdhci_host *host, u8 mask);
@@ -22975,7 +23103,7 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.h linux-3.6.7.patch/drivers/mmc/ho
  #endif /* __SDHCI_HW_H */
 diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.c linux-3.6.7.patch/drivers/net/usb/smsc95xx.c
 --- linux-3.6.7/drivers/net/usb/smsc95xx.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/net/usb/smsc95xx.c	2012-11-18 12:45:10.783337439 +0100
++++ linux-3.6.7.patch/drivers/net/usb/smsc95xx.c	2012-11-18 20:53:35.207717002 +0100
 @@ -46,11 +46,23 @@
  #define SMSC95XX_INTERNAL_PHY_ID	(1)
  #define SMSC95XX_TX_OVERHEAD		(8)
@@ -23992,7 +24120,7 @@ diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.c linux-3.6.7.patch/drivers/net/
  };
 diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.h linux-3.6.7.patch/drivers/net/usb/smsc95xx.h
 --- linux-3.6.7/drivers/net/usb/smsc95xx.h	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/net/usb/smsc95xx.h	2012-11-18 12:45:10.784337459 +0100
++++ linux-3.6.7.patch/drivers/net/usb/smsc95xx.h	2012-11-18 20:53:35.208717021 +0100
 @@ -63,6 +63,7 @@
  #define INT_STS_TDFO_			(0x00001000)
  #define INT_STS_RXDF_			(0x00000800)
@@ -24033,7 +24161,7 @@ diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.h linux-3.6.7.patch/drivers/net/
  #define Tx_COE_EN_			(0x00010000)
 diff -Naur linux-3.6.7/drivers/spi/Kconfig linux-3.6.7.patch/drivers/spi/Kconfig
 --- linux-3.6.7/drivers/spi/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/spi/Kconfig	2012-11-18 12:45:10.785337478 +0100
++++ linux-3.6.7.patch/drivers/spi/Kconfig	2012-11-18 20:53:35.210717059 +0100
 @@ -74,6 +74,14 @@
  	  This selects a driver for the Atmel SPI Controller, present on
  	  many AT32 (AVR32) and AT91 (ARM) chips.
@@ -24051,7 +24179,7 @@ diff -Naur linux-3.6.7/drivers/spi/Kconfig linux-3.6.7.patch/drivers/spi/Kconfig
  	depends on BLACKFIN
 diff -Naur linux-3.6.7/drivers/spi/Makefile linux-3.6.7.patch/drivers/spi/Makefile
 --- linux-3.6.7/drivers/spi/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/spi/Makefile	2012-11-18 12:45:10.786337497 +0100
++++ linux-3.6.7.patch/drivers/spi/Makefile	2012-11-18 20:53:35.210717059 +0100
 @@ -16,6 +16,7 @@
  obj-$(CONFIG_SPI_AU1550)		+= spi-au1550.o
  obj-$(CONFIG_SPI_BCM63XX)		+= spi-bcm63xx.o
@@ -24062,7 +24190,7 @@ diff -Naur linux-3.6.7/drivers/spi/Makefile linux-3.6.7.patch/drivers/spi/Makefi
  obj-$(CONFIG_SPI_BUTTERFLY)		+= spi-butterfly.o
 diff -Naur linux-3.6.7/drivers/spi/spi-bcm2708.c linux-3.6.7.patch/drivers/spi/spi-bcm2708.c
 --- linux-3.6.7/drivers/spi/spi-bcm2708.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/spi/spi-bcm2708.c	2012-11-18 12:45:10.787337516 +0100
++++ linux-3.6.7.patch/drivers/spi/spi-bcm2708.c	2012-11-18 20:53:35.211717078 +0100
 @@ -0,0 +1,594 @@
 +/*
 + * Driver for Broadcom BCM2708 SPI Controllers
@@ -24660,7 +24788,7 @@ diff -Naur linux-3.6.7/drivers/spi/spi-bcm2708.c linux-3.6.7.patch/drivers/spi/s
 +MODULE_ALIAS("platform:" DRV_NAME);
 diff -Naur linux-3.6.7/drivers/thermal/bcm2835-thermal.c linux-3.6.7.patch/drivers/thermal/bcm2835-thermal.c
 --- linux-3.6.7/drivers/thermal/bcm2835-thermal.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/thermal/bcm2835-thermal.c	2012-11-18 12:45:10.787337516 +0100
++++ linux-3.6.7.patch/drivers/thermal/bcm2835-thermal.c	2012-11-18 20:53:35.212717097 +0100
 @@ -0,0 +1,208 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -24872,7 +25000,7 @@ diff -Naur linux-3.6.7/drivers/thermal/bcm2835-thermal.c linux-3.6.7.patch/drive
 +module_platform_driver(bcm2835_thermal_driver);
 diff -Naur linux-3.6.7/drivers/thermal/Kconfig linux-3.6.7.patch/drivers/thermal/Kconfig
 --- linux-3.6.7/drivers/thermal/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/thermal/Kconfig	2012-11-18 12:45:10.788337535 +0100
++++ linux-3.6.7.patch/drivers/thermal/Kconfig	2012-11-18 20:53:35.212717097 +0100
 @@ -27,3 +27,14 @@
  	help
  	  Enable this to plug the SPEAr thermal sensor driver into the Linux
@@ -24890,7 +25018,7 @@ diff -Naur linux-3.6.7/drivers/thermal/Kconfig linux-3.6.7.patch/drivers/thermal
 +
 diff -Naur linux-3.6.7/drivers/thermal/Makefile linux-3.6.7.patch/drivers/thermal/Makefile
 --- linux-3.6.7/drivers/thermal/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/thermal/Makefile	2012-11-18 12:45:10.788337535 +0100
++++ linux-3.6.7.patch/drivers/thermal/Makefile	2012-11-18 20:53:35.213717116 +0100
 @@ -3,4 +3,5 @@
  #
  
@@ -24901,7 +25029,7 @@ diff -Naur linux-3.6.7/drivers/thermal/Makefile linux-3.6.7.patch/drivers/therma
 +obj-$(CONFIG_THERMAL_BCM2835)	+= bcm2835-thermal.o
 diff -Naur linux-3.6.7/drivers/usb/core/generic.c linux-3.6.7.patch/drivers/usb/core/generic.c
 --- linux-3.6.7/drivers/usb/core/generic.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/core/generic.c	2012-11-18 12:45:10.789337554 +0100
++++ linux-3.6.7.patch/drivers/usb/core/generic.c	2012-11-18 20:53:35.213717116 +0100
 @@ -149,6 +149,7 @@
  		dev_warn(&udev->dev,
  			"no configuration chosen from %d choice%s\n",
@@ -24912,7 +25040,7 @@ diff -Naur linux-3.6.7/drivers/usb/core/generic.c linux-3.6.7.patch/drivers/usb/
  }
 diff -Naur linux-3.6.7/drivers/usb/core/hub.c linux-3.6.7.patch/drivers/usb/core/hub.c
 --- linux-3.6.7/drivers/usb/core/hub.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/core/hub.c	2012-11-18 12:45:10.792337614 +0100
++++ linux-3.6.7.patch/drivers/usb/core/hub.c	2012-11-18 20:53:35.216717173 +0100
 @@ -25,7 +25,6 @@
  #include <linux/kthread.h>
  #include <linux/mutex.h>
@@ -25033,5022 +25161,9 @@ diff -Naur linux-3.6.7/drivers/usb/core/hub.c linux-3.6.7.patch/drivers/usb/core
  	}
  	if (hub->hdev->parent ||
  			!hcd->driver->port_handed_over ||
-diff -Naur linux-3.6.7/drivers/usb/core/hub.c.orig linux-3.6.7.patch/drivers/usb/core/hub.c.orig
---- linux-3.6.7/drivers/usb/core/hub.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/core/hub.c.orig	2012-11-17 22:21:23.000000000 +0100
-@@ -0,0 +1,5009 @@
-+/*
-+ * USB hub driver.
-+ *
-+ * (C) Copyright 1999 Linus Torvalds
-+ * (C) Copyright 1999 Johannes Erdfelt
-+ * (C) Copyright 1999 Gregory P. Smith
-+ * (C) Copyright 2001 Brad Hards (bhards@bigpond.net.au)
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/completion.h>
-+#include <linux/sched.h>
-+#include <linux/list.h>
-+#include <linux/slab.h>
-+#include <linux/ioctl.h>
-+#include <linux/usb.h>
-+#include <linux/usbdevice_fs.h>
-+#include <linux/usb/hcd.h>
-+#include <linux/usb/otg.h>
-+#include <linux/usb/quirks.h>
-+#include <linux/kthread.h>
-+#include <linux/mutex.h>
-+#include <linux/freezer.h>
-+#include <linux/random.h>
-+
-+#include <asm/uaccess.h>
-+#include <asm/byteorder.h>
-+
-+#include "usb.h"
-+
-+/* if we are in debug mode, always announce new devices */
-+#ifdef DEBUG
-+#ifndef CONFIG_USB_ANNOUNCE_NEW_DEVICES
-+#define CONFIG_USB_ANNOUNCE_NEW_DEVICES
-+#endif
-+#endif
-+
-+struct usb_hub {
-+	struct device		*intfdev;	/* the "interface" device */
-+	struct usb_device	*hdev;
-+	struct kref		kref;
-+	struct urb		*urb;		/* for interrupt polling pipe */
-+
-+	/* buffer for urb ... with extra space in case of babble */
-+	char			(*buffer)[8];
-+	union {
-+		struct usb_hub_status	hub;
-+		struct usb_port_status	port;
-+	}			*status;	/* buffer for status reports */
-+	struct mutex		status_mutex;	/* for the status buffer */
-+
-+	int			error;		/* last reported error */
-+	int			nerrors;	/* track consecutive errors */
-+
-+	struct list_head	event_list;	/* hubs w/data or errs ready */
-+	unsigned long		event_bits[1];	/* status change bitmask */
-+	unsigned long		change_bits[1];	/* ports with logical connect
-+							status change */
-+	unsigned long		busy_bits[1];	/* ports being reset or
-+							resumed */
-+	unsigned long		removed_bits[1]; /* ports with a "removed"
-+							device present */
-+	unsigned long		wakeup_bits[1];	/* ports that have signaled
-+							remote wakeup */
-+#if USB_MAXCHILDREN > 31 /* 8*sizeof(unsigned long) - 1 */
-+#error event_bits[] is too short!
-+#endif
-+
-+	struct usb_hub_descriptor *descriptor;	/* class descriptor */
-+	struct usb_tt		tt;		/* Transaction Translator */
-+
-+	unsigned		mA_per_port;	/* current for each child */
-+
-+	unsigned		limited_power:1;
-+	unsigned		quiescing:1;
-+	unsigned		disconnected:1;
-+
-+	unsigned		has_indicators:1;
-+	u8			indicator[USB_MAXCHILDREN];
-+	struct delayed_work	leds;
-+	struct delayed_work	init_work;
-+	struct dev_state	**port_owners;
-+};
-+
-+static inline int hub_is_superspeed(struct usb_device *hdev)
-+{
-+	return (hdev->descriptor.bDeviceProtocol == USB_HUB_PR_SS);
-+}
-+
-+/* Protect struct usb_device->state and ->children members
-+ * Note: Both are also protected by ->dev.sem, except that ->state can
-+ * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
-+static DEFINE_SPINLOCK(device_state_lock);
-+
-+/* khubd's worklist and its lock */
-+static DEFINE_SPINLOCK(hub_event_lock);
-+static LIST_HEAD(hub_event_list);	/* List of hubs needing servicing */
-+
-+/* Wakes up khubd */
-+static DECLARE_WAIT_QUEUE_HEAD(khubd_wait);
-+
-+static struct task_struct *khubd_task;
-+
-+/* cycle leds on hubs that aren't blinking for attention */
-+static bool blinkenlights = 0;
-+module_param (blinkenlights, bool, S_IRUGO);
-+MODULE_PARM_DESC (blinkenlights, "true to cycle leds on hubs");
-+
-+/*
-+ * Device SATA8000 FW1.0 from DATAST0R Technology Corp requires about
-+ * 10 seconds to send reply for the initial 64-byte descriptor request.
-+ */
-+/* define initial 64-byte descriptor request timeout in milliseconds */
-+static int initial_descriptor_timeout = USB_CTRL_GET_TIMEOUT;
-+module_param(initial_descriptor_timeout, int, S_IRUGO|S_IWUSR);
-+MODULE_PARM_DESC(initial_descriptor_timeout,
-+		"initial 64-byte descriptor request timeout in milliseconds "
-+		"(default 5000 - 5.0 seconds)");
-+
-+/*
-+ * As of 2.6.10 we introduce a new USB device initialization scheme which
-+ * closely resembles the way Windows works.  Hopefully it will be compatible
-+ * with a wider range of devices than the old scheme.  However some previously
-+ * working devices may start giving rise to "device not accepting address"
-+ * errors; if that happens the user can try the old scheme by adjusting the
-+ * following module parameters.
-+ *
-+ * For maximum flexibility there are two boolean parameters to control the
-+ * hub driver's behavior.  On the first initialization attempt, if the
-+ * "old_scheme_first" parameter is set then the old scheme will be used,
-+ * otherwise the new scheme is used.  If that fails and "use_both_schemes"
-+ * is set, then the driver will make another attempt, using the other scheme.
-+ */
-+static bool old_scheme_first = 0;
-+module_param(old_scheme_first, bool, S_IRUGO | S_IWUSR);
-+MODULE_PARM_DESC(old_scheme_first,
-+		 "start with the old device initialization scheme");
-+
-+static bool use_both_schemes = 1;
-+module_param(use_both_schemes, bool, S_IRUGO | S_IWUSR);
-+MODULE_PARM_DESC(use_both_schemes,
-+		"try the other device initialization scheme if the "
-+		"first one fails");
-+
-+/* Mutual exclusion for EHCI CF initialization.  This interferes with
-+ * port reset on some companion controllers.
-+ */
-+DECLARE_RWSEM(ehci_cf_port_reset_rwsem);
-+EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);
-+
-+#define HUB_DEBOUNCE_TIMEOUT	1500
-+#define HUB_DEBOUNCE_STEP	  25
-+#define HUB_DEBOUNCE_STABLE	 100
-+
-+
-+static int usb_reset_and_verify_device(struct usb_device *udev);
-+
-+static inline char *portspeed(struct usb_hub *hub, int portstatus)
-+{
-+	if (hub_is_superspeed(hub->hdev))
-+		return "5.0 Gb/s";
-+	if (portstatus & USB_PORT_STAT_HIGH_SPEED)
-+    		return "480 Mb/s";
-+	else if (portstatus & USB_PORT_STAT_LOW_SPEED)
-+		return "1.5 Mb/s";
-+	else
-+		return "12 Mb/s";
-+}
-+
-+/* Note that hdev or one of its children must be locked! */
-+static struct usb_hub *hdev_to_hub(struct usb_device *hdev)
-+{
-+	if (!hdev || !hdev->actconfig)
-+		return NULL;
-+	return usb_get_intfdata(hdev->actconfig->interface[0]);
-+}
-+
-+static int usb_device_supports_lpm(struct usb_device *udev)
-+{
-+	/* USB 2.1 (and greater) devices indicate LPM support through
-+	 * their USB 2.0 Extended Capabilities BOS descriptor.
-+	 */
-+	if (udev->speed == USB_SPEED_HIGH) {
-+		if (udev->bos->ext_cap &&
-+			(USB_LPM_SUPPORT &
-+			 le32_to_cpu(udev->bos->ext_cap->bmAttributes)))
-+			return 1;
-+		return 0;
-+	}
-+
-+	/* All USB 3.0 must support LPM, but we need their max exit latency
-+	 * information from the SuperSpeed Extended Capabilities BOS descriptor.
-+	 */
-+	if (!udev->bos->ss_cap) {
-+		dev_warn(&udev->dev, "No LPM exit latency info found.  "
-+				"Power management will be impacted.\n");
-+		return 0;
-+	}
-+	if (udev->parent->lpm_capable)
-+		return 1;
-+
-+	dev_warn(&udev->dev, "Parent hub missing LPM exit latency info.  "
-+			"Power management will be impacted.\n");
-+	return 0;
-+}
-+
-+/*
-+ * Set the Maximum Exit Latency (MEL) for the host to initiate a transition from
-+ * either U1 or U2.
-+ */
-+static void usb_set_lpm_mel(struct usb_device *udev,
-+		struct usb3_lpm_parameters *udev_lpm_params,
-+		unsigned int udev_exit_latency,
-+		struct usb_hub *hub,
-+		struct usb3_lpm_parameters *hub_lpm_params,
-+		unsigned int hub_exit_latency)
-+{
-+	unsigned int total_mel;
-+	unsigned int device_mel;
-+	unsigned int hub_mel;
-+
-+	/*
-+	 * Calculate the time it takes to transition all links from the roothub
-+	 * to the parent hub into U0.  The parent hub must then decode the
-+	 * packet (hub header decode latency) to figure out which port it was
-+	 * bound for.
-+	 *
-+	 * The Hub Header decode latency is expressed in 0.1us intervals (0x1
-+	 * means 0.1us).  Multiply that by 100 to get nanoseconds.
-+	 */
-+	total_mel = hub_lpm_params->mel +
-+		(hub->descriptor->u.ss.bHubHdrDecLat * 100);
-+
-+	/*
-+	 * How long will it take to transition the downstream hub's port into
-+	 * U0?  The greater of either the hub exit latency or the device exit
-+	 * latency.
-+	 *
-+	 * The BOS U1/U2 exit latencies are expressed in 1us intervals.
-+	 * Multiply that by 1000 to get nanoseconds.
-+	 */
-+	device_mel = udev_exit_latency * 1000;
-+	hub_mel = hub_exit_latency * 1000;
-+	if (device_mel > hub_mel)
-+		total_mel += device_mel;
-+	else
-+		total_mel += hub_mel;
-+
-+	udev_lpm_params->mel = total_mel;
-+}
-+
-+/*
-+ * Set the maximum Device to Host Exit Latency (PEL) for the device to initiate
-+ * a transition from either U1 or U2.
-+ */
-+static void usb_set_lpm_pel(struct usb_device *udev,
-+		struct usb3_lpm_parameters *udev_lpm_params,
-+		unsigned int udev_exit_latency,
-+		struct usb_hub *hub,
-+		struct usb3_lpm_parameters *hub_lpm_params,
-+		unsigned int hub_exit_latency,
-+		unsigned int port_to_port_exit_latency)
-+{
-+	unsigned int first_link_pel;
-+	unsigned int hub_pel;
-+
-+	/*
-+	 * First, the device sends an LFPS to transition the link between the
-+	 * device and the parent hub into U0.  The exit latency is the bigger of
-+	 * the device exit latency or the hub exit latency.
-+	 */
-+	if (udev_exit_latency > hub_exit_latency)
-+		first_link_pel = udev_exit_latency * 1000;
-+	else
-+		first_link_pel = hub_exit_latency * 1000;
-+
-+	/*
-+	 * When the hub starts to receive the LFPS, there is a slight delay for
-+	 * it to figure out that one of the ports is sending an LFPS.  Then it
-+	 * will forward the LFPS to its upstream link.  The exit latency is the
-+	 * delay, plus the PEL that we calculated for this hub.
-+	 */
-+	hub_pel = port_to_port_exit_latency * 1000 + hub_lpm_params->pel;
-+
-+	/*
-+	 * According to figure C-7 in the USB 3.0 spec, the PEL for this device
-+	 * is the greater of the two exit latencies.
-+	 */
-+	if (first_link_pel > hub_pel)
-+		udev_lpm_params->pel = first_link_pel;
-+	else
-+		udev_lpm_params->pel = hub_pel;
-+}
-+
-+/*
-+ * Set the System Exit Latency (SEL) to indicate the total worst-case time from
-+ * when a device initiates a transition to U0, until when it will receive the
-+ * first packet from the host controller.
-+ *
-+ * Section C.1.5.1 describes the four components to this:
-+ *  - t1: device PEL
-+ *  - t2: time for the ERDY to make it from the device to the host.
-+ *  - t3: a host-specific delay to process the ERDY.
-+ *  - t4: time for the packet to make it from the host to the device.
-+ *
-+ * t3 is specific to both the xHCI host and the platform the host is integrated
-+ * into.  The Intel HW folks have said it's negligible, FIXME if a different
-+ * vendor says otherwise.
-+ */
-+static void usb_set_lpm_sel(struct usb_device *udev,
-+		struct usb3_lpm_parameters *udev_lpm_params)
-+{
-+	struct usb_device *parent;
-+	unsigned int num_hubs;
-+	unsigned int total_sel;
-+
-+	/* t1 = device PEL */
-+	total_sel = udev_lpm_params->pel;
-+	/* How many external hubs are in between the device & the root port. */
-+	for (parent = udev->parent, num_hubs = 0; parent->parent;
-+			parent = parent->parent)
-+		num_hubs++;
-+	/* t2 = 2.1us + 250ns * (num_hubs - 1) */
-+	if (num_hubs > 0)
-+		total_sel += 2100 + 250 * (num_hubs - 1);
-+
-+	/* t4 = 250ns * num_hubs */
-+	total_sel += 250 * num_hubs;
-+
-+	udev_lpm_params->sel = total_sel;
-+}
-+
-+static void usb_set_lpm_parameters(struct usb_device *udev)
-+{
-+	struct usb_hub *hub;
-+	unsigned int port_to_port_delay;
-+	unsigned int udev_u1_del;
-+	unsigned int udev_u2_del;
-+	unsigned int hub_u1_del;
-+	unsigned int hub_u2_del;
-+
-+	if (!udev->lpm_capable || udev->speed != USB_SPEED_SUPER)
-+		return;
-+
-+	hub = hdev_to_hub(udev->parent);
-+	/* It doesn't take time to transition the roothub into U0, since it
-+	 * doesn't have an upstream link.
-+	 */
-+	if (!hub)
-+		return;
-+
-+	udev_u1_del = udev->bos->ss_cap->bU1devExitLat;
-+	udev_u2_del = udev->bos->ss_cap->bU2DevExitLat;
-+	hub_u1_del = udev->parent->bos->ss_cap->bU1devExitLat;
-+	hub_u2_del = udev->parent->bos->ss_cap->bU2DevExitLat;
-+
-+	usb_set_lpm_mel(udev, &udev->u1_params, udev_u1_del,
-+			hub, &udev->parent->u1_params, hub_u1_del);
-+
-+	usb_set_lpm_mel(udev, &udev->u2_params, udev_u2_del,
-+			hub, &udev->parent->u2_params, hub_u2_del);
-+
-+	/*
-+	 * Appendix C, section C.2.2.2, says that there is a slight delay from
-+	 * when the parent hub notices the downstream port is trying to
-+	 * transition to U0 to when the hub initiates a U0 transition on its
-+	 * upstream port.  The section says the delays are tPort2PortU1EL and
-+	 * tPort2PortU2EL, but it doesn't define what they are.
-+	 *
-+	 * The hub chapter, sections 10.4.2.4 and 10.4.2.5 seem to be talking
-+	 * about the same delays.  Use the maximum delay calculations from those
-+	 * sections.  For U1, it's tHubPort2PortExitLat, which is 1us max.  For
-+	 * U2, it's tHubPort2PortExitLat + U2DevExitLat - U1DevExitLat.  I
-+	 * assume the device exit latencies they are talking about are the hub
-+	 * exit latencies.
-+	 *
-+	 * What do we do if the U2 exit latency is less than the U1 exit
-+	 * latency?  It's possible, although not likely...
-+	 */
-+	port_to_port_delay = 1;
-+
-+	usb_set_lpm_pel(udev, &udev->u1_params, udev_u1_del,
-+			hub, &udev->parent->u1_params, hub_u1_del,
-+			port_to_port_delay);
-+
-+	if (hub_u2_del > hub_u1_del)
-+		port_to_port_delay = 1 + hub_u2_del - hub_u1_del;
-+	else
-+		port_to_port_delay = 1 + hub_u1_del;
-+
-+	usb_set_lpm_pel(udev, &udev->u2_params, udev_u2_del,
-+			hub, &udev->parent->u2_params, hub_u2_del,
-+			port_to_port_delay);
-+
-+	/* Now that we've got PEL, calculate SEL. */
-+	usb_set_lpm_sel(udev, &udev->u1_params);
-+	usb_set_lpm_sel(udev, &udev->u2_params);
-+}
-+
-+/* USB 2.0 spec Section 11.24.4.5 */
-+static int get_hub_descriptor(struct usb_device *hdev, void *data)
-+{
-+	int i, ret, size;
-+	unsigned dtype;
-+
-+	if (hub_is_superspeed(hdev)) {
-+		dtype = USB_DT_SS_HUB;
-+		size = USB_DT_SS_HUB_SIZE;
-+	} else {
-+		dtype = USB_DT_HUB;
-+		size = sizeof(struct usb_hub_descriptor);
-+	}
-+
-+	for (i = 0; i < 3; i++) {
-+		ret = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
-+			USB_REQ_GET_DESCRIPTOR, USB_DIR_IN | USB_RT_HUB,
-+			dtype << 8, 0, data, size,
-+			USB_CTRL_GET_TIMEOUT);
-+		if (ret >= (USB_DT_HUB_NONVAR_SIZE + 2))
-+			return ret;
-+	}
-+	return -EINVAL;
-+}
-+
-+/*
-+ * USB 2.0 spec Section 11.24.2.1
-+ */
-+static int clear_hub_feature(struct usb_device *hdev, int feature)
-+{
-+	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+		USB_REQ_CLEAR_FEATURE, USB_RT_HUB, feature, 0, NULL, 0, 1000);
-+}
-+
-+/*
-+ * USB 2.0 spec Section 11.24.2.2
-+ */
-+static int clear_port_feature(struct usb_device *hdev, int port1, int feature)
-+{
-+	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+		USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature, port1,
-+		NULL, 0, 1000);
-+}
-+
-+/*
-+ * USB 2.0 spec Section 11.24.2.13
-+ */
-+static int set_port_feature(struct usb_device *hdev, int port1, int feature)
-+{
-+	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+		USB_REQ_SET_FEATURE, USB_RT_PORT, feature, port1,
-+		NULL, 0, 1000);
-+}
-+
-+/*
-+ * USB 2.0 spec Section 11.24.2.7.1.10 and table 11-7
-+ * for info about using port indicators
-+ */
-+static void set_port_led(
-+	struct usb_hub *hub,
-+	int port1,
-+	int selector
-+)
-+{
-+	int status = set_port_feature(hub->hdev, (selector << 8) | port1,
-+			USB_PORT_FEAT_INDICATOR);
-+	if (status < 0)
-+		dev_dbg (hub->intfdev,
-+			"port %d indicator %s status %d\n",
-+			port1,
-+			({ char *s; switch (selector) {
-+			case HUB_LED_AMBER: s = "amber"; break;
-+			case HUB_LED_GREEN: s = "green"; break;
-+			case HUB_LED_OFF: s = "off"; break;
-+			case HUB_LED_AUTO: s = "auto"; break;
-+			default: s = "??"; break;
-+			}; s; }),
-+			status);
-+}
-+
-+#define	LED_CYCLE_PERIOD	((2*HZ)/3)
-+
-+static void led_work (struct work_struct *work)
-+{
-+	struct usb_hub		*hub =
-+		container_of(work, struct usb_hub, leds.work);
-+	struct usb_device	*hdev = hub->hdev;
-+	unsigned		i;
-+	unsigned		changed = 0;
-+	int			cursor = -1;
-+
-+	if (hdev->state != USB_STATE_CONFIGURED || hub->quiescing)
-+		return;
-+
-+	for (i = 0; i < hub->descriptor->bNbrPorts; i++) {
-+		unsigned	selector, mode;
-+
-+		/* 30%-50% duty cycle */
-+
-+		switch (hub->indicator[i]) {
-+		/* cycle marker */
-+		case INDICATOR_CYCLE:
-+			cursor = i;
-+			selector = HUB_LED_AUTO;
-+			mode = INDICATOR_AUTO;
-+			break;
-+		/* blinking green = sw attention */
-+		case INDICATOR_GREEN_BLINK:
-+			selector = HUB_LED_GREEN;
-+			mode = INDICATOR_GREEN_BLINK_OFF;
-+			break;
-+		case INDICATOR_GREEN_BLINK_OFF:
-+			selector = HUB_LED_OFF;
-+			mode = INDICATOR_GREEN_BLINK;
-+			break;
-+		/* blinking amber = hw attention */
-+		case INDICATOR_AMBER_BLINK:
-+			selector = HUB_LED_AMBER;
-+			mode = INDICATOR_AMBER_BLINK_OFF;
-+			break;
-+		case INDICATOR_AMBER_BLINK_OFF:
-+			selector = HUB_LED_OFF;
-+			mode = INDICATOR_AMBER_BLINK;
-+			break;
-+		/* blink green/amber = reserved */
-+		case INDICATOR_ALT_BLINK:
-+			selector = HUB_LED_GREEN;
-+			mode = INDICATOR_ALT_BLINK_OFF;
-+			break;
-+		case INDICATOR_ALT_BLINK_OFF:
-+			selector = HUB_LED_AMBER;
-+			mode = INDICATOR_ALT_BLINK;
-+			break;
-+		default:
-+			continue;
-+		}
-+		if (selector != HUB_LED_AUTO)
-+			changed = 1;
-+		set_port_led(hub, i + 1, selector);
-+		hub->indicator[i] = mode;
-+	}
-+	if (!changed && blinkenlights) {
-+		cursor++;
-+		cursor %= hub->descriptor->bNbrPorts;
-+		set_port_led(hub, cursor + 1, HUB_LED_GREEN);
-+		hub->indicator[cursor] = INDICATOR_CYCLE;
-+		changed++;
-+	}
-+	if (changed)
-+		schedule_delayed_work(&hub->leds, LED_CYCLE_PERIOD);
-+}
-+
-+/* use a short timeout for hub/port status fetches */
-+#define	USB_STS_TIMEOUT		1000
-+#define	USB_STS_RETRIES		5
-+
-+/*
-+ * USB 2.0 spec Section 11.24.2.6
-+ */
-+static int get_hub_status(struct usb_device *hdev,
-+		struct usb_hub_status *data)
-+{
-+	int i, status = -ETIMEDOUT;
-+
-+	for (i = 0; i < USB_STS_RETRIES &&
-+			(status == -ETIMEDOUT || status == -EPIPE); i++) {
-+		status = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
-+			USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_HUB, 0, 0,
-+			data, sizeof(*data), USB_STS_TIMEOUT);
-+	}
-+	return status;
-+}
-+
-+/*
-+ * USB 2.0 spec Section 11.24.2.7
-+ */
-+static int get_port_status(struct usb_device *hdev, int port1,
-+		struct usb_port_status *data)
-+{
-+	int i, status = -ETIMEDOUT;
-+
-+	for (i = 0; i < USB_STS_RETRIES &&
-+			(status == -ETIMEDOUT || status == -EPIPE); i++) {
-+		status = usb_control_msg(hdev, usb_rcvctrlpipe(hdev, 0),
-+			USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port1,
-+			data, sizeof(*data), USB_STS_TIMEOUT);
-+	}
-+	return status;
-+}
-+
-+static int hub_port_status(struct usb_hub *hub, int port1,
-+		u16 *status, u16 *change)
-+{
-+	int ret;
-+
-+	mutex_lock(&hub->status_mutex);
-+	ret = get_port_status(hub->hdev, port1, &hub->status->port);
-+	if (ret < 4) {
-+		dev_err(hub->intfdev,
-+			"%s failed (err = %d)\n", __func__, ret);
-+		if (ret >= 0)
-+			ret = -EIO;
-+	} else {
-+		*status = le16_to_cpu(hub->status->port.wPortStatus);
-+		*change = le16_to_cpu(hub->status->port.wPortChange);
-+
-+		ret = 0;
-+	}
-+	mutex_unlock(&hub->status_mutex);
-+	return ret;
-+}
-+
-+static void kick_khubd(struct usb_hub *hub)
-+{
-+	unsigned long	flags;
-+
-+	spin_lock_irqsave(&hub_event_lock, flags);
-+	if (!hub->disconnected && list_empty(&hub->event_list)) {
-+		list_add_tail(&hub->event_list, &hub_event_list);
-+
-+		/* Suppress autosuspend until khubd runs */
-+		usb_autopm_get_interface_no_resume(
-+				to_usb_interface(hub->intfdev));
-+		wake_up(&khubd_wait);
-+	}
-+	spin_unlock_irqrestore(&hub_event_lock, flags);
-+}
-+
-+void usb_kick_khubd(struct usb_device *hdev)
-+{
-+	struct usb_hub *hub = hdev_to_hub(hdev);
-+
-+	if (hub)
-+		kick_khubd(hub);
-+}
-+
-+/*
-+ * Let the USB core know that a USB 3.0 device has sent a Function Wake Device
-+ * Notification, which indicates it had initiated remote wakeup.
-+ *
-+ * USB 3.0 hubs do not report the port link state change from U3 to U0 when the
-+ * device initiates resume, so the USB core will not receive notice of the
-+ * resume through the normal hub interrupt URB.
-+ */
-+void usb_wakeup_notification(struct usb_device *hdev,
-+		unsigned int portnum)
-+{
-+	struct usb_hub *hub;
-+
-+	if (!hdev)
-+		return;
-+
-+	hub = hdev_to_hub(hdev);
-+	if (hub) {
-+		set_bit(portnum, hub->wakeup_bits);
-+		kick_khubd(hub);
-+	}
-+}
-+EXPORT_SYMBOL_GPL(usb_wakeup_notification);
-+
-+/* completion function, fires on port status changes and various faults */
-+static void hub_irq(struct urb *urb)
-+{
-+	struct usb_hub *hub = urb->context;
-+	int status = urb->status;
-+	unsigned i;
-+	unsigned long bits;
-+
-+	switch (status) {
-+	case -ENOENT:		/* synchronous unlink */
-+	case -ECONNRESET:	/* async unlink */
-+	case -ESHUTDOWN:	/* hardware going away */
-+		return;
-+
-+	default:		/* presumably an error */
-+		/* Cause a hub reset after 10 consecutive errors */
-+		dev_dbg (hub->intfdev, "transfer --> %d\n", status);
-+		if ((++hub->nerrors < 10) || hub->error)
-+			goto resubmit;
-+		hub->error = status;
-+		/* FALL THROUGH */
-+
-+	/* let khubd handle things */
-+	case 0:			/* we got data:  port status changed */
-+		bits = 0;
-+		for (i = 0; i < urb->actual_length; ++i)
-+			bits |= ((unsigned long) ((*hub->buffer)[i]))
-+					<< (i*8);
-+		hub->event_bits[0] = bits;
-+		break;
-+	}
-+
-+	hub->nerrors = 0;
-+
-+	/* Something happened, let khubd figure it out */
-+	kick_khubd(hub);
-+
-+resubmit:
-+	if (hub->quiescing)
-+		return;
-+
-+	if ((status = usb_submit_urb (hub->urb, GFP_ATOMIC)) != 0
-+			&& status != -ENODEV && status != -EPERM)
-+		dev_err (hub->intfdev, "resubmit --> %d\n", status);
-+}
-+
-+/* USB 2.0 spec Section 11.24.2.3 */
-+static inline int
-+hub_clear_tt_buffer (struct usb_device *hdev, u16 devinfo, u16 tt)
-+{
-+	return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+			       HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,
-+			       tt, NULL, 0, 1000);
-+}
-+
-+/*
-+ * enumeration blocks khubd for a long time. we use keventd instead, since
-+ * long blocking there is the exception, not the rule.  accordingly, HCDs
-+ * talking to TTs must queue control transfers (not just bulk and iso), so
-+ * both can talk to the same hub concurrently.
-+ */
-+static void hub_tt_work(struct work_struct *work)
-+{
-+	struct usb_hub		*hub =
-+		container_of(work, struct usb_hub, tt.clear_work);
-+	unsigned long		flags;
-+	int			limit = 100;
-+
-+	spin_lock_irqsave (&hub->tt.lock, flags);
-+	while (!list_empty(&hub->tt.clear_list)) {
-+		struct list_head	*next;
-+		struct usb_tt_clear	*clear;
-+		struct usb_device	*hdev = hub->hdev;
-+		const struct hc_driver	*drv;
-+		int			status;
-+
-+		if (!hub->quiescing && --limit < 0)
-+			break;
-+
-+		next = hub->tt.clear_list.next;
-+		clear = list_entry (next, struct usb_tt_clear, clear_list);
-+		list_del (&clear->clear_list);
-+
-+		/* drop lock so HCD can concurrently report other TT errors */
-+		spin_unlock_irqrestore (&hub->tt.lock, flags);
-+		status = hub_clear_tt_buffer (hdev, clear->devinfo, clear->tt);
-+		if (status)
-+			dev_err (&hdev->dev,
-+				"clear tt %d (%04x) error %d\n",
-+				clear->tt, clear->devinfo, status);
-+
-+		/* Tell the HCD, even if the operation failed */
-+		drv = clear->hcd->driver;
-+		if (drv->clear_tt_buffer_complete)
-+			(drv->clear_tt_buffer_complete)(clear->hcd, clear->ep);
-+
-+		kfree(clear);
-+		spin_lock_irqsave(&hub->tt.lock, flags);
-+	}
-+	spin_unlock_irqrestore (&hub->tt.lock, flags);
-+}
-+
-+/**
-+ * usb_hub_clear_tt_buffer - clear control/bulk TT state in high speed hub
-+ * @urb: an URB associated with the failed or incomplete split transaction
-+ *
-+ * High speed HCDs use this to tell the hub driver that some split control or
-+ * bulk transaction failed in a way that requires clearing internal state of
-+ * a transaction translator.  This is normally detected (and reported) from
-+ * interrupt context.
-+ *
-+ * It may not be possible for that hub to handle additional full (or low)
-+ * speed transactions until that state is fully cleared out.
-+ */
-+int usb_hub_clear_tt_buffer(struct urb *urb)
-+{
-+	struct usb_device	*udev = urb->dev;
-+	int			pipe = urb->pipe;
-+	struct usb_tt		*tt = udev->tt;
-+	unsigned long		flags;
-+	struct usb_tt_clear	*clear;
-+
-+	/* we've got to cope with an arbitrary number of pending TT clears,
-+	 * since each TT has "at least two" buffers that can need it (and
-+	 * there can be many TTs per hub).  even if they're uncommon.
-+	 */
-+	if ((clear = kmalloc (sizeof *clear, GFP_ATOMIC)) == NULL) {
-+		dev_err (&udev->dev, "can't save CLEAR_TT_BUFFER state\n");
-+		/* FIXME recover somehow ... RESET_TT? */
-+		return -ENOMEM;
-+	}
-+
-+	/* info that CLEAR_TT_BUFFER needs */
-+	clear->tt = tt->multi ? udev->ttport : 1;
-+	clear->devinfo = usb_pipeendpoint (pipe);
-+	clear->devinfo |= udev->devnum << 4;
-+	clear->devinfo |= usb_pipecontrol (pipe)
-+			? (USB_ENDPOINT_XFER_CONTROL << 11)
-+			: (USB_ENDPOINT_XFER_BULK << 11);
-+	if (usb_pipein (pipe))
-+		clear->devinfo |= 1 << 15;
-+
-+	/* info for completion callback */
-+	clear->hcd = bus_to_hcd(udev->bus);
-+	clear->ep = urb->ep;
-+
-+	/* tell keventd to clear state for this TT */
-+	spin_lock_irqsave (&tt->lock, flags);
-+	list_add_tail (&clear->clear_list, &tt->clear_list);
-+	schedule_work(&tt->clear_work);
-+	spin_unlock_irqrestore (&tt->lock, flags);
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(usb_hub_clear_tt_buffer);
-+
-+/* If do_delay is false, return the number of milliseconds the caller
-+ * needs to delay.
-+ */
-+static unsigned hub_power_on(struct usb_hub *hub, bool do_delay)
-+{
-+	int port1;
-+	unsigned pgood_delay = hub->descriptor->bPwrOn2PwrGood * 2;
-+	unsigned delay;
-+	u16 wHubCharacteristics =
-+			le16_to_cpu(hub->descriptor->wHubCharacteristics);
-+
-+	/* Enable power on each port.  Some hubs have reserved values
-+	 * of LPSM (> 2) in their descriptors, even though they are
-+	 * USB 2.0 hubs.  Some hubs do not implement port-power switching
-+	 * but only emulate it.  In all cases, the ports won't work
-+	 * unless we send these messages to the hub.
-+	 */
-+	if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2)
-+		dev_dbg(hub->intfdev, "enabling power on all ports\n");
-+	else
-+		dev_dbg(hub->intfdev, "trying to enable port power on "
-+				"non-switchable hub\n");
-+	for (port1 = 1; port1 <= hub->descriptor->bNbrPorts; port1++)
-+		set_port_feature(hub->hdev, port1, USB_PORT_FEAT_POWER);
-+
-+	/* Wait at least 100 msec for power to become stable */
-+	delay = max(pgood_delay, (unsigned) 100);
-+	if (do_delay)
-+		msleep(delay);
-+	return delay;
-+}
-+
-+static int hub_hub_status(struct usb_hub *hub,
-+		u16 *status, u16 *change)
-+{
-+	int ret;
-+
-+	mutex_lock(&hub->status_mutex);
-+	ret = get_hub_status(hub->hdev, &hub->status->hub);
-+	if (ret < 0)
-+		dev_err (hub->intfdev,
-+			"%s failed (err = %d)\n", __func__, ret);
-+	else {
-+		*status = le16_to_cpu(hub->status->hub.wHubStatus);
-+		*change = le16_to_cpu(hub->status->hub.wHubChange); 
-+		ret = 0;
-+	}
-+	mutex_unlock(&hub->status_mutex);
-+	return ret;
-+}
-+
-+static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
-+{
-+	struct usb_device *hdev = hub->hdev;
-+	int ret = 0;
-+
-+	if (hdev->children[port1-1] && set_state)
-+		usb_set_device_state(hdev->children[port1-1],
-+				USB_STATE_NOTATTACHED);
-+	if (!hub->error && !hub_is_superspeed(hub->hdev))
-+		ret = clear_port_feature(hdev, port1, USB_PORT_FEAT_ENABLE);
-+	if (ret)
-+		dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
-+				port1, ret);
-+	return ret;
-+}
-+
-+/*
-+ * Disable a port and mark a logical connect-change event, so that some
-+ * time later khubd will disconnect() any existing usb_device on the port
-+ * and will re-enumerate if there actually is a device attached.
-+ */
-+static void hub_port_logical_disconnect(struct usb_hub *hub, int port1)
-+{
-+	dev_dbg(hub->intfdev, "logical disconnect on port %d\n", port1);
-+	hub_port_disable(hub, port1, 1);
-+
-+	/* FIXME let caller ask to power down the port:
-+	 *  - some devices won't enumerate without a VBUS power cycle
-+	 *  - SRP saves power that way
-+	 *  - ... new call, TBD ...
-+	 * That's easy if this hub can switch power per-port, and
-+	 * khubd reactivates the port later (timer, SRP, etc).
-+	 * Powerdown must be optional, because of reset/DFU.
-+	 */
-+
-+	set_bit(port1, hub->change_bits);
-+ 	kick_khubd(hub);
-+}
-+
-+/**
-+ * usb_remove_device - disable a device's port on its parent hub
-+ * @udev: device to be disabled and removed
-+ * Context: @udev locked, must be able to sleep.
-+ *
-+ * After @udev's port has been disabled, khubd is notified and it will
-+ * see that the device has been disconnected.  When the device is
-+ * physically unplugged and something is plugged in, the events will
-+ * be received and processed normally.
-+ */
-+int usb_remove_device(struct usb_device *udev)
-+{
-+	struct usb_hub *hub;
-+	struct usb_interface *intf;
-+
-+	if (!udev->parent)	/* Can't remove a root hub */
-+		return -EINVAL;
-+	hub = hdev_to_hub(udev->parent);
-+	intf = to_usb_interface(hub->intfdev);
-+
-+	usb_autopm_get_interface(intf);
-+	set_bit(udev->portnum, hub->removed_bits);
-+	hub_port_logical_disconnect(hub, udev->portnum);
-+	usb_autopm_put_interface(intf);
-+	return 0;
-+}
-+
-+enum hub_activation_type {
-+	HUB_INIT, HUB_INIT2, HUB_INIT3,		/* INITs must come first */
-+	HUB_POST_RESET, HUB_RESUME, HUB_RESET_RESUME,
-+};
-+
-+static void hub_init_func2(struct work_struct *ws);
-+static void hub_init_func3(struct work_struct *ws);
-+
-+static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
-+{
-+	struct usb_device *hdev = hub->hdev;
-+	struct usb_hcd *hcd;
-+	int ret;
-+	int port1;
-+	int status;
-+	bool need_debounce_delay = false;
-+	unsigned delay;
-+
-+	/* Continue a partial initialization */
-+	if (type == HUB_INIT2)
-+		goto init2;
-+	if (type == HUB_INIT3)
-+		goto init3;
-+
-+	/* The superspeed hub except for root hub has to use Hub Depth
-+	 * value as an offset into the route string to locate the bits
-+	 * it uses to determine the downstream port number. So hub driver
-+	 * should send a set hub depth request to superspeed hub after
-+	 * the superspeed hub is set configuration in initialization or
-+	 * reset procedure.
-+	 *
-+	 * After a resume, port power should still be on.
-+	 * For any other type of activation, turn it on.
-+	 */
-+	if (type != HUB_RESUME) {
-+		if (hdev->parent && hub_is_superspeed(hdev)) {
-+			ret = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+					HUB_SET_DEPTH, USB_RT_HUB,
-+					hdev->level - 1, 0, NULL, 0,
-+					USB_CTRL_SET_TIMEOUT);
-+			if (ret < 0)
-+				dev_err(hub->intfdev,
-+						"set hub depth failed\n");
-+		}
-+
-+		/* Speed up system boot by using a delayed_work for the
-+		 * hub's initial power-up delays.  This is pretty awkward
-+		 * and the implementation looks like a home-brewed sort of
-+		 * setjmp/longjmp, but it saves at least 100 ms for each
-+		 * root hub (assuming usbcore is compiled into the kernel
-+		 * rather than as a module).  It adds up.
-+		 *
-+		 * This can't be done for HUB_RESUME or HUB_RESET_RESUME
-+		 * because for those activation types the ports have to be
-+		 * operational when we return.  In theory this could be done
-+		 * for HUB_POST_RESET, but it's easier not to.
-+		 */
-+		if (type == HUB_INIT) {
-+			delay = hub_power_on(hub, false);
-+			PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
-+			schedule_delayed_work(&hub->init_work,
-+					msecs_to_jiffies(delay));
-+
-+			/* Suppress autosuspend until init is done */
-+			usb_autopm_get_interface_no_resume(
-+					to_usb_interface(hub->intfdev));
-+			return;		/* Continues at init2: below */
-+		} else if (type == HUB_RESET_RESUME) {
-+			/* The internal host controller state for the hub device
-+			 * may be gone after a host power loss on system resume.
-+			 * Update the device's info so the HW knows it's a hub.
-+			 */
-+			hcd = bus_to_hcd(hdev->bus);
-+			if (hcd->driver->update_hub_device) {
-+				ret = hcd->driver->update_hub_device(hcd, hdev,
-+						&hub->tt, GFP_NOIO);
-+				if (ret < 0) {
-+					dev_err(hub->intfdev, "Host not "
-+							"accepting hub info "
-+							"update.\n");
-+					dev_err(hub->intfdev, "LS/FS devices "
-+							"and hubs may not work "
-+							"under this hub\n.");
-+				}
-+			}
-+			hub_power_on(hub, true);
-+		} else {
-+			hub_power_on(hub, true);
-+		}
-+	}
-+ init2:
-+
-+	/* Check each port and set hub->change_bits to let khubd know
-+	 * which ports need attention.
-+	 */
-+	for (port1 = 1; port1 <= hdev->maxchild; ++port1) {
-+		struct usb_device *udev = hdev->children[port1-1];
-+		u16 portstatus, portchange;
-+
-+		portstatus = portchange = 0;
-+		status = hub_port_status(hub, port1, &portstatus, &portchange);
-+		if (udev || (portstatus & USB_PORT_STAT_CONNECTION))
-+			dev_dbg(hub->intfdev,
-+					"port %d: status %04x change %04x\n",
-+					port1, portstatus, portchange);
-+
-+		/* After anything other than HUB_RESUME (i.e., initialization
-+		 * or any sort of reset), every port should be disabled.
-+		 * Unconnected ports should likewise be disabled (paranoia),
-+		 * and so should ports for which we have no usb_device.
-+		 */
-+		if ((portstatus & USB_PORT_STAT_ENABLE) && (
-+				type != HUB_RESUME ||
-+				!(portstatus & USB_PORT_STAT_CONNECTION) ||
-+				!udev ||
-+				udev->state == USB_STATE_NOTATTACHED)) {
-+			/*
-+			 * USB3 protocol ports will automatically transition
-+			 * to Enabled state when detect an USB3.0 device attach.
-+			 * Do not disable USB3 protocol ports.
-+			 */
-+			if (!hub_is_superspeed(hdev)) {
-+				clear_port_feature(hdev, port1,
-+						   USB_PORT_FEAT_ENABLE);
-+				portstatus &= ~USB_PORT_STAT_ENABLE;
-+			} else {
-+				/* Pretend that power was lost for USB3 devs */
-+				portstatus &= ~USB_PORT_STAT_ENABLE;
-+			}
-+		}
-+
-+		/* Clear status-change flags; we'll debounce later */
-+		if (portchange & USB_PORT_STAT_C_CONNECTION) {
-+			need_debounce_delay = true;
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_CONNECTION);
-+		}
-+		if (portchange & USB_PORT_STAT_C_ENABLE) {
-+			need_debounce_delay = true;
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_ENABLE);
-+		}
-+		if ((portchange & USB_PORT_STAT_C_BH_RESET) &&
-+				hub_is_superspeed(hub->hdev)) {
-+			need_debounce_delay = true;
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_BH_PORT_RESET);
-+		}
-+		/* We can forget about a "removed" device when there's a
-+		 * physical disconnect or the connect status changes.
-+		 */
-+		if (!(portstatus & USB_PORT_STAT_CONNECTION) ||
-+				(portchange & USB_PORT_STAT_C_CONNECTION))
-+			clear_bit(port1, hub->removed_bits);
-+
-+		if (!udev || udev->state == USB_STATE_NOTATTACHED) {
-+			/* Tell khubd to disconnect the device or
-+			 * check for a new connection
-+			 */
-+			if (udev || (portstatus & USB_PORT_STAT_CONNECTION))
-+				set_bit(port1, hub->change_bits);
-+
-+		} else if (portstatus & USB_PORT_STAT_ENABLE) {
-+			bool port_resumed = (portstatus &
-+					USB_PORT_STAT_LINK_STATE) ==
-+				USB_SS_PORT_LS_U0;
-+			/* The power session apparently survived the resume.
-+			 * If there was an overcurrent or suspend change
-+			 * (i.e., remote wakeup request), have khubd
-+			 * take care of it.  Look at the port link state
-+			 * for USB 3.0 hubs, since they don't have a suspend
-+			 * change bit, and they don't set the port link change
-+			 * bit on device-initiated resume.
-+			 */
-+			if (portchange || (hub_is_superspeed(hub->hdev) &&
-+						port_resumed))
-+				set_bit(port1, hub->change_bits);
-+
-+		} else if (udev->persist_enabled) {
-+#ifdef CONFIG_PM
-+			udev->reset_resume = 1;
-+#endif
-+			set_bit(port1, hub->change_bits);
-+
-+		} else {
-+			/* The power session is gone; tell khubd */
-+			usb_set_device_state(udev, USB_STATE_NOTATTACHED);
-+			set_bit(port1, hub->change_bits);
-+		}
-+	}
-+
-+	/* If no port-status-change flags were set, we don't need any
-+	 * debouncing.  If flags were set we can try to debounce the
-+	 * ports all at once right now, instead of letting khubd do them
-+	 * one at a time later on.
-+	 *
-+	 * If any port-status changes do occur during this delay, khubd
-+	 * will see them later and handle them normally.
-+	 */
-+	if (need_debounce_delay) {
-+		delay = HUB_DEBOUNCE_STABLE;
-+
-+		/* Don't do a long sleep inside a workqueue routine */
-+		if (type == HUB_INIT2) {
-+			PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func3);
-+			schedule_delayed_work(&hub->init_work,
-+					msecs_to_jiffies(delay));
-+			return;		/* Continues at init3: below */
-+		} else {
-+			msleep(delay);
-+		}
-+	}
-+ init3:
-+	hub->quiescing = 0;
-+
-+	status = usb_submit_urb(hub->urb, GFP_NOIO);
-+	if (status < 0)
-+		dev_err(hub->intfdev, "activate --> %d\n", status);
-+	if (hub->has_indicators && blinkenlights)
-+		schedule_delayed_work(&hub->leds, LED_CYCLE_PERIOD);
-+
-+	/* Scan all ports that need attention */
-+	kick_khubd(hub);
-+
-+	/* Allow autosuspend if it was suppressed */
-+	if (type <= HUB_INIT3)
-+		usb_autopm_put_interface_async(to_usb_interface(hub->intfdev));
-+}
-+
-+/* Implement the continuations for the delays above */
-+static void hub_init_func2(struct work_struct *ws)
-+{
-+	struct usb_hub *hub = container_of(ws, struct usb_hub, init_work.work);
-+
-+	hub_activate(hub, HUB_INIT2);
-+}
-+
-+static void hub_init_func3(struct work_struct *ws)
-+{
-+	struct usb_hub *hub = container_of(ws, struct usb_hub, init_work.work);
-+
-+	hub_activate(hub, HUB_INIT3);
-+}
-+
-+enum hub_quiescing_type {
-+	HUB_DISCONNECT, HUB_PRE_RESET, HUB_SUSPEND
-+};
-+
-+static void hub_quiesce(struct usb_hub *hub, enum hub_quiescing_type type)
-+{
-+	struct usb_device *hdev = hub->hdev;
-+	int i;
-+
-+	cancel_delayed_work_sync(&hub->init_work);
-+
-+	/* khubd and related activity won't re-trigger */
-+	hub->quiescing = 1;
-+
-+	if (type != HUB_SUSPEND) {
-+		/* Disconnect all the children */
-+		for (i = 0; i < hdev->maxchild; ++i) {
-+			if (hdev->children[i])
-+				usb_disconnect(&hdev->children[i]);
-+		}
-+	}
-+
-+	/* Stop khubd and related activity */
-+	usb_kill_urb(hub->urb);
-+	if (hub->has_indicators)
-+		cancel_delayed_work_sync(&hub->leds);
-+	if (hub->tt.hub)
-+		flush_work_sync(&hub->tt.clear_work);
-+}
-+
-+/* caller has locked the hub device */
-+static int hub_pre_reset(struct usb_interface *intf)
-+{
-+	struct usb_hub *hub = usb_get_intfdata(intf);
-+
-+	hub_quiesce(hub, HUB_PRE_RESET);
-+	return 0;
-+}
-+
-+/* caller has locked the hub device */
-+static int hub_post_reset(struct usb_interface *intf)
-+{
-+	struct usb_hub *hub = usb_get_intfdata(intf);
-+
-+	hub_activate(hub, HUB_POST_RESET);
-+	return 0;
-+}
-+
-+static int hub_configure(struct usb_hub *hub,
-+	struct usb_endpoint_descriptor *endpoint)
-+{
-+	struct usb_hcd *hcd;
-+	struct usb_device *hdev = hub->hdev;
-+	struct device *hub_dev = hub->intfdev;
-+	u16 hubstatus, hubchange;
-+	u16 wHubCharacteristics;
-+	unsigned int pipe;
-+	int maxp, ret;
-+	char *message = "out of memory";
-+
-+	hub->buffer = kmalloc(sizeof(*hub->buffer), GFP_KERNEL);
-+	if (!hub->buffer) {
-+		ret = -ENOMEM;
-+		goto fail;
-+	}
-+
-+	hub->status = kmalloc(sizeof(*hub->status), GFP_KERNEL);
-+	if (!hub->status) {
-+		ret = -ENOMEM;
-+		goto fail;
-+	}
-+	mutex_init(&hub->status_mutex);
-+
-+	hub->descriptor = kmalloc(sizeof(*hub->descriptor), GFP_KERNEL);
-+	if (!hub->descriptor) {
-+		ret = -ENOMEM;
-+		goto fail;
-+	}
-+
-+	/* Request the entire hub descriptor.
-+	 * hub->descriptor can handle USB_MAXCHILDREN ports,
-+	 * but the hub can/will return fewer bytes here.
-+	 */
-+	ret = get_hub_descriptor(hdev, hub->descriptor);
-+	if (ret < 0) {
-+		message = "can't read hub descriptor";
-+		goto fail;
-+	} else if (hub->descriptor->bNbrPorts > USB_MAXCHILDREN) {
-+		message = "hub has too many ports!";
-+		ret = -ENODEV;
-+		goto fail;
-+	}
-+
-+	hdev->maxchild = hub->descriptor->bNbrPorts;
-+	dev_info (hub_dev, "%d port%s detected\n", hdev->maxchild,
-+		(hdev->maxchild == 1) ? "" : "s");
-+
-+	hdev->children = kzalloc(hdev->maxchild *
-+				sizeof(struct usb_device *), GFP_KERNEL);
-+	hub->port_owners = kzalloc(hdev->maxchild * sizeof(struct dev_state *),
-+				GFP_KERNEL);
-+	if (!hdev->children || !hub->port_owners) {
-+		ret = -ENOMEM;
-+		goto fail;
-+	}
-+
-+	wHubCharacteristics = le16_to_cpu(hub->descriptor->wHubCharacteristics);
-+
-+	/* FIXME for USB 3.0, skip for now */
-+	if ((wHubCharacteristics & HUB_CHAR_COMPOUND) &&
-+			!(hub_is_superspeed(hdev))) {
-+		int	i;
-+		char	portstr [USB_MAXCHILDREN + 1];
-+
-+		for (i = 0; i < hdev->maxchild; i++)
-+			portstr[i] = hub->descriptor->u.hs.DeviceRemovable
-+				    [((i + 1) / 8)] & (1 << ((i + 1) % 8))
-+				? 'F' : 'R';
-+		portstr[hdev->maxchild] = 0;
-+		dev_dbg(hub_dev, "compound device; port removable status: %s\n", portstr);
-+	} else
-+		dev_dbg(hub_dev, "standalone hub\n");
-+
-+	switch (wHubCharacteristics & HUB_CHAR_LPSM) {
-+	case HUB_CHAR_COMMON_LPSM:
-+		dev_dbg(hub_dev, "ganged power switching\n");
-+		break;
-+	case HUB_CHAR_INDV_PORT_LPSM:
-+		dev_dbg(hub_dev, "individual port power switching\n");
-+		break;
-+	case HUB_CHAR_NO_LPSM:
-+	case HUB_CHAR_LPSM:
-+		dev_dbg(hub_dev, "no power switching (usb 1.0)\n");
-+		break;
-+	}
-+
-+	switch (wHubCharacteristics & HUB_CHAR_OCPM) {
-+	case HUB_CHAR_COMMON_OCPM:
-+		dev_dbg(hub_dev, "global over-current protection\n");
-+		break;
-+	case HUB_CHAR_INDV_PORT_OCPM:
-+		dev_dbg(hub_dev, "individual port over-current protection\n");
-+		break;
-+	case HUB_CHAR_NO_OCPM:
-+	case HUB_CHAR_OCPM:
-+		dev_dbg(hub_dev, "no over-current protection\n");
-+		break;
-+	}
-+
-+	spin_lock_init (&hub->tt.lock);
-+	INIT_LIST_HEAD (&hub->tt.clear_list);
-+	INIT_WORK(&hub->tt.clear_work, hub_tt_work);
-+	switch (hdev->descriptor.bDeviceProtocol) {
-+	case USB_HUB_PR_FS:
-+		break;
-+	case USB_HUB_PR_HS_SINGLE_TT:
-+		dev_dbg(hub_dev, "Single TT\n");
-+		hub->tt.hub = hdev;
-+		break;
-+	case USB_HUB_PR_HS_MULTI_TT:
-+		ret = usb_set_interface(hdev, 0, 1);
-+		if (ret == 0) {
-+			dev_dbg(hub_dev, "TT per port\n");
-+			hub->tt.multi = 1;
-+		} else
-+			dev_err(hub_dev, "Using single TT (err %d)\n",
-+				ret);
-+		hub->tt.hub = hdev;
-+		break;
-+	case USB_HUB_PR_SS:
-+		/* USB 3.0 hubs don't have a TT */
-+		break;
-+	default:
-+		dev_dbg(hub_dev, "Unrecognized hub protocol %d\n",
-+			hdev->descriptor.bDeviceProtocol);
-+		break;
-+	}
-+
-+	/* Note 8 FS bit times == (8 bits / 12000000 bps) ~= 666ns */
-+	switch (wHubCharacteristics & HUB_CHAR_TTTT) {
-+		case HUB_TTTT_8_BITS:
-+			if (hdev->descriptor.bDeviceProtocol != 0) {
-+				hub->tt.think_time = 666;
-+				dev_dbg(hub_dev, "TT requires at most %d "
-+						"FS bit times (%d ns)\n",
-+					8, hub->tt.think_time);
-+			}
-+			break;
-+		case HUB_TTTT_16_BITS:
-+			hub->tt.think_time = 666 * 2;
-+			dev_dbg(hub_dev, "TT requires at most %d "
-+					"FS bit times (%d ns)\n",
-+				16, hub->tt.think_time);
-+			break;
-+		case HUB_TTTT_24_BITS:
-+			hub->tt.think_time = 666 * 3;
-+			dev_dbg(hub_dev, "TT requires at most %d "
-+					"FS bit times (%d ns)\n",
-+				24, hub->tt.think_time);
-+			break;
-+		case HUB_TTTT_32_BITS:
-+			hub->tt.think_time = 666 * 4;
-+			dev_dbg(hub_dev, "TT requires at most %d "
-+					"FS bit times (%d ns)\n",
-+				32, hub->tt.think_time);
-+			break;
-+	}
-+
-+	/* probe() zeroes hub->indicator[] */
-+	if (wHubCharacteristics & HUB_CHAR_PORTIND) {
-+		hub->has_indicators = 1;
-+		dev_dbg(hub_dev, "Port indicators are supported\n");
-+	}
-+
-+	dev_dbg(hub_dev, "power on to power good time: %dms\n",
-+		hub->descriptor->bPwrOn2PwrGood * 2);
-+
-+	/* power budgeting mostly matters with bus-powered hubs,
-+	 * and battery-powered root hubs (may provide just 8 mA).
-+	 */
-+	ret = usb_get_status(hdev, USB_RECIP_DEVICE, 0, &hubstatus);
-+	if (ret < 2) {
-+		message = "can't get hub status";
-+		goto fail;
-+	}
-+	le16_to_cpus(&hubstatus);
-+	if (hdev == hdev->bus->root_hub) {
-+		if (hdev->bus_mA == 0 || hdev->bus_mA >= 500)
-+			hub->mA_per_port = 500;
-+		else {
-+			hub->mA_per_port = hdev->bus_mA;
-+			hub->limited_power = 1;
-+		}
-+	} else if ((hubstatus & (1 << USB_DEVICE_SELF_POWERED)) == 0) {
-+		dev_dbg(hub_dev, "hub controller current requirement: %dmA\n",
-+			hub->descriptor->bHubContrCurrent);
-+		hub->limited_power = 1;
-+		if (hdev->maxchild > 0) {
-+			int remaining = hdev->bus_mA -
-+					hub->descriptor->bHubContrCurrent;
-+
-+			if (remaining < hdev->maxchild * 100)
-+				dev_warn(hub_dev,
-+					"insufficient power available "
-+					"to use all downstream ports\n");
-+			hub->mA_per_port = 100;		/* 7.2.1.1 */
-+		}
-+	} else {	/* Self-powered external hub */
-+		/* FIXME: What about battery-powered external hubs that
-+		 * provide less current per port? */
-+		hub->mA_per_port = 500;
-+	}
-+	if (hub->mA_per_port < 500)
-+		dev_dbg(hub_dev, "%umA bus power budget for each child\n",
-+				hub->mA_per_port);
-+
-+	/* Update the HCD's internal representation of this hub before khubd
-+	 * starts getting port status changes for devices under the hub.
-+	 */
-+	hcd = bus_to_hcd(hdev->bus);
-+	if (hcd->driver->update_hub_device) {
-+		ret = hcd->driver->update_hub_device(hcd, hdev,
-+				&hub->tt, GFP_KERNEL);
-+		if (ret < 0) {
-+			message = "can't update HCD hub info";
-+			goto fail;
-+		}
-+	}
-+
-+	ret = hub_hub_status(hub, &hubstatus, &hubchange);
-+	if (ret < 0) {
-+		message = "can't get hub status";
-+		goto fail;
-+	}
-+
-+	/* local power status reports aren't always correct */
-+	if (hdev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_SELFPOWER)
-+		dev_dbg(hub_dev, "local power source is %s\n",
-+			(hubstatus & HUB_STATUS_LOCAL_POWER)
-+			? "lost (inactive)" : "good");
-+
-+	if ((wHubCharacteristics & HUB_CHAR_OCPM) == 0)
-+		dev_dbg(hub_dev, "%sover-current condition exists\n",
-+			(hubstatus & HUB_STATUS_OVERCURRENT) ? "" : "no ");
-+
-+	/* set up the interrupt endpoint
-+	 * We use the EP's maxpacket size instead of (PORTS+1+7)/8
-+	 * bytes as USB2.0[11.12.3] says because some hubs are known
-+	 * to send more data (and thus cause overflow). For root hubs,
-+	 * maxpktsize is defined in hcd.c's fake endpoint descriptors
-+	 * to be big enough for at least USB_MAXCHILDREN ports. */
-+	pipe = usb_rcvintpipe(hdev, endpoint->bEndpointAddress);
-+	maxp = usb_maxpacket(hdev, pipe, usb_pipeout(pipe));
-+
-+	if (maxp > sizeof(*hub->buffer))
-+		maxp = sizeof(*hub->buffer);
-+
-+	hub->urb = usb_alloc_urb(0, GFP_KERNEL);
-+	if (!hub->urb) {
-+		ret = -ENOMEM;
-+		goto fail;
-+	}
-+
-+	usb_fill_int_urb(hub->urb, hdev, pipe, *hub->buffer, maxp, hub_irq,
-+		hub, endpoint->bInterval);
-+
-+	/* maybe cycle the hub leds */
-+	if (hub->has_indicators && blinkenlights)
-+		hub->indicator [0] = INDICATOR_CYCLE;
-+
-+	hub_activate(hub, HUB_INIT);
-+	return 0;
-+
-+fail:
-+	dev_err (hub_dev, "config failed, %s (err %d)\n",
-+			message, ret);
-+	/* hub_disconnect() frees urb and descriptor */
-+	return ret;
-+}
-+
-+static void hub_release(struct kref *kref)
-+{
-+	struct usb_hub *hub = container_of(kref, struct usb_hub, kref);
-+
-+	usb_put_intf(to_usb_interface(hub->intfdev));
-+	kfree(hub);
-+}
-+
-+static unsigned highspeed_hubs;
-+
-+static void hub_disconnect(struct usb_interface *intf)
-+{
-+	struct usb_hub *hub = usb_get_intfdata(intf);
-+	struct usb_device *hdev = interface_to_usbdev(intf);
-+
-+	/* Take the hub off the event list and don't let it be added again */
-+	spin_lock_irq(&hub_event_lock);
-+	if (!list_empty(&hub->event_list)) {
-+		list_del_init(&hub->event_list);
-+		usb_autopm_put_interface_no_suspend(intf);
-+	}
-+	hub->disconnected = 1;
-+	spin_unlock_irq(&hub_event_lock);
-+
-+	/* Disconnect all children and quiesce the hub */
-+	hub->error = 0;
-+	hub_quiesce(hub, HUB_DISCONNECT);
-+
-+	usb_set_intfdata (intf, NULL);
-+	hub->hdev->maxchild = 0;
-+
-+	if (hub->hdev->speed == USB_SPEED_HIGH)
-+		highspeed_hubs--;
-+
-+	usb_free_urb(hub->urb);
-+	kfree(hdev->children);
-+	kfree(hub->port_owners);
-+	kfree(hub->descriptor);
-+	kfree(hub->status);
-+	kfree(hub->buffer);
-+
-+	kref_put(&hub->kref, hub_release);
-+}
-+
-+static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
-+{
-+	struct usb_host_interface *desc;
-+	struct usb_endpoint_descriptor *endpoint;
-+	struct usb_device *hdev;
-+	struct usb_hub *hub;
-+
-+	desc = intf->cur_altsetting;
-+	hdev = interface_to_usbdev(intf);
-+
-+	/* Hubs have proper suspend/resume support. */
-+	usb_enable_autosuspend(hdev);
-+
-+	if (hdev->level == MAX_TOPO_LEVEL) {
-+		dev_err(&intf->dev,
-+			"Unsupported bus topology: hub nested too deep\n");
-+		return -E2BIG;
-+	}
-+
-+#ifdef	CONFIG_USB_OTG_BLACKLIST_HUB
-+	if (hdev->parent) {
-+		dev_warn(&intf->dev, "ignoring external hub\n");
-+		return -ENODEV;
-+	}
-+#endif
-+
-+	/* Some hubs have a subclass of 1, which AFAICT according to the */
-+	/*  specs is not defined, but it works */
-+	if ((desc->desc.bInterfaceSubClass != 0) &&
-+	    (desc->desc.bInterfaceSubClass != 1)) {
-+descriptor_error:
-+		dev_err (&intf->dev, "bad descriptor, ignoring hub\n");
-+		return -EIO;
-+	}
-+
-+	/* Multiple endpoints? What kind of mutant ninja-hub is this? */
-+	if (desc->desc.bNumEndpoints != 1)
-+		goto descriptor_error;
-+
-+	endpoint = &desc->endpoint[0].desc;
-+
-+	/* If it's not an interrupt in endpoint, we'd better punt! */
-+	if (!usb_endpoint_is_int_in(endpoint))
-+		goto descriptor_error;
-+
-+	/* We found a hub */
-+	dev_info (&intf->dev, "USB hub found\n");
-+
-+	hub = kzalloc(sizeof(*hub), GFP_KERNEL);
-+	if (!hub) {
-+		dev_dbg (&intf->dev, "couldn't kmalloc hub struct\n");
-+		return -ENOMEM;
-+	}
-+
-+	kref_init(&hub->kref);
-+	INIT_LIST_HEAD(&hub->event_list);
-+	hub->intfdev = &intf->dev;
-+	hub->hdev = hdev;
-+	INIT_DELAYED_WORK(&hub->leds, led_work);
-+	INIT_DELAYED_WORK(&hub->init_work, NULL);
-+	usb_get_intf(intf);
-+
-+	usb_set_intfdata (intf, hub);
-+	intf->needs_remote_wakeup = 1;
-+
-+	if (hdev->speed == USB_SPEED_HIGH)
-+		highspeed_hubs++;
-+
-+	if (hub_configure(hub, endpoint) >= 0)
-+		return 0;
-+
-+	hub_disconnect (intf);
-+	return -ENODEV;
-+}
-+
-+static int
-+hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)
-+{
-+	struct usb_device *hdev = interface_to_usbdev (intf);
-+
-+	/* assert ifno == 0 (part of hub spec) */
-+	switch (code) {
-+	case USBDEVFS_HUB_PORTINFO: {
-+		struct usbdevfs_hub_portinfo *info = user_data;
-+		int i;
-+
-+		spin_lock_irq(&device_state_lock);
-+		if (hdev->devnum <= 0)
-+			info->nports = 0;
-+		else {
-+			info->nports = hdev->maxchild;
-+			for (i = 0; i < info->nports; i++) {
-+				if (hdev->children[i] == NULL)
-+					info->port[i] = 0;
-+				else
-+					info->port[i] =
-+						hdev->children[i]->devnum;
-+			}
-+		}
-+		spin_unlock_irq(&device_state_lock);
-+
-+		return info->nports + 1;
-+		}
-+
-+	default:
-+		return -ENOSYS;
-+	}
-+}
-+
-+/*
-+ * Allow user programs to claim ports on a hub.  When a device is attached
-+ * to one of these "claimed" ports, the program will "own" the device.
-+ */
-+static int find_port_owner(struct usb_device *hdev, unsigned port1,
-+		struct dev_state ***ppowner)
-+{
-+	if (hdev->state == USB_STATE_NOTATTACHED)
-+		return -ENODEV;
-+	if (port1 == 0 || port1 > hdev->maxchild)
-+		return -EINVAL;
-+
-+	/* This assumes that devices not managed by the hub driver
-+	 * will always have maxchild equal to 0.
-+	 */
-+	*ppowner = &(hdev_to_hub(hdev)->port_owners[port1 - 1]);
-+	return 0;
-+}
-+
-+/* In the following three functions, the caller must hold hdev's lock */
-+int usb_hub_claim_port(struct usb_device *hdev, unsigned port1,
-+		       struct dev_state *owner)
-+{
-+	int rc;
-+	struct dev_state **powner;
-+
-+	rc = find_port_owner(hdev, port1, &powner);
-+	if (rc)
-+		return rc;
-+	if (*powner)
-+		return -EBUSY;
-+	*powner = owner;
-+	return rc;
-+}
-+
-+int usb_hub_release_port(struct usb_device *hdev, unsigned port1,
-+			 struct dev_state *owner)
-+{
-+	int rc;
-+	struct dev_state **powner;
-+
-+	rc = find_port_owner(hdev, port1, &powner);
-+	if (rc)
-+		return rc;
-+	if (*powner != owner)
-+		return -ENOENT;
-+	*powner = NULL;
-+	return rc;
-+}
-+
-+void usb_hub_release_all_ports(struct usb_device *hdev, struct dev_state *owner)
-+{
-+	int n;
-+	struct dev_state **powner;
-+
-+	n = find_port_owner(hdev, 1, &powner);
-+	if (n == 0) {
-+		for (; n < hdev->maxchild; (++n, ++powner)) {
-+			if (*powner == owner)
-+				*powner = NULL;
-+		}
-+	}
-+}
-+
-+/* The caller must hold udev's lock */
-+bool usb_device_is_owned(struct usb_device *udev)
-+{
-+	struct usb_hub *hub;
-+
-+	if (udev->state == USB_STATE_NOTATTACHED || !udev->parent)
-+		return false;
-+	hub = hdev_to_hub(udev->parent);
-+	return !!hub->port_owners[udev->portnum - 1];
-+}
-+
-+
-+static void recursively_mark_NOTATTACHED(struct usb_device *udev)
-+{
-+	int i;
-+
-+	for (i = 0; i < udev->maxchild; ++i) {
-+		if (udev->children[i])
-+			recursively_mark_NOTATTACHED(udev->children[i]);
-+	}
-+	if (udev->state == USB_STATE_SUSPENDED)
-+		udev->active_duration -= jiffies;
-+	udev->state = USB_STATE_NOTATTACHED;
-+}
-+
-+/**
-+ * usb_set_device_state - change a device's current state (usbcore, hcds)
-+ * @udev: pointer to device whose state should be changed
-+ * @new_state: new state value to be stored
-+ *
-+ * udev->state is _not_ fully protected by the device lock.  Although
-+ * most transitions are made only while holding the lock, the state can
-+ * can change to USB_STATE_NOTATTACHED at almost any time.  This
-+ * is so that devices can be marked as disconnected as soon as possible,
-+ * without having to wait for any semaphores to be released.  As a result,
-+ * all changes to any device's state must be protected by the
-+ * device_state_lock spinlock.
-+ *
-+ * Once a device has been added to the device tree, all changes to its state
-+ * should be made using this routine.  The state should _not_ be set directly.
-+ *
-+ * If udev->state is already USB_STATE_NOTATTACHED then no change is made.
-+ * Otherwise udev->state is set to new_state, and if new_state is
-+ * USB_STATE_NOTATTACHED then all of udev's descendants' states are also set
-+ * to USB_STATE_NOTATTACHED.
-+ */
-+void usb_set_device_state(struct usb_device *udev,
-+		enum usb_device_state new_state)
-+{
-+	unsigned long flags;
-+	int wakeup = -1;
-+
-+	spin_lock_irqsave(&device_state_lock, flags);
-+	if (udev->state == USB_STATE_NOTATTACHED)
-+		;	/* do nothing */
-+	else if (new_state != USB_STATE_NOTATTACHED) {
-+
-+		/* root hub wakeup capabilities are managed out-of-band
-+		 * and may involve silicon errata ... ignore them here.
-+		 */
-+		if (udev->parent) {
-+			if (udev->state == USB_STATE_SUSPENDED
-+					|| new_state == USB_STATE_SUSPENDED)
-+				;	/* No change to wakeup settings */
-+			else if (new_state == USB_STATE_CONFIGURED)
-+				wakeup = udev->actconfig->desc.bmAttributes
-+					 & USB_CONFIG_ATT_WAKEUP;
-+			else
-+				wakeup = 0;
-+		}
-+		if (udev->state == USB_STATE_SUSPENDED &&
-+			new_state != USB_STATE_SUSPENDED)
-+			udev->active_duration -= jiffies;
-+		else if (new_state == USB_STATE_SUSPENDED &&
-+				udev->state != USB_STATE_SUSPENDED)
-+			udev->active_duration += jiffies;
-+		udev->state = new_state;
-+	} else
-+		recursively_mark_NOTATTACHED(udev);
-+	spin_unlock_irqrestore(&device_state_lock, flags);
-+	if (wakeup >= 0)
-+		device_set_wakeup_capable(&udev->dev, wakeup);
-+}
-+EXPORT_SYMBOL_GPL(usb_set_device_state);
-+
-+/*
-+ * Choose a device number.
-+ *
-+ * Device numbers are used as filenames in usbfs.  On USB-1.1 and
-+ * USB-2.0 buses they are also used as device addresses, however on
-+ * USB-3.0 buses the address is assigned by the controller hardware
-+ * and it usually is not the same as the device number.
-+ *
-+ * WUSB devices are simple: they have no hubs behind, so the mapping
-+ * device <-> virtual port number becomes 1:1. Why? to simplify the
-+ * life of the device connection logic in
-+ * drivers/usb/wusbcore/devconnect.c. When we do the initial secret
-+ * handshake we need to assign a temporary address in the unauthorized
-+ * space. For simplicity we use the first virtual port number found to
-+ * be free [drivers/usb/wusbcore/devconnect.c:wusbhc_devconnect_ack()]
-+ * and that becomes it's address [X < 128] or its unauthorized address
-+ * [X | 0x80].
-+ *
-+ * We add 1 as an offset to the one-based USB-stack port number
-+ * (zero-based wusb virtual port index) for two reasons: (a) dev addr
-+ * 0 is reserved by USB for default address; (b) Linux's USB stack
-+ * uses always #1 for the root hub of the controller. So USB stack's
-+ * port #1, which is wusb virtual-port #0 has address #2.
-+ *
-+ * Devices connected under xHCI are not as simple.  The host controller
-+ * supports virtualization, so the hardware assigns device addresses and
-+ * the HCD must setup data structures before issuing a set address
-+ * command to the hardware.
-+ */
-+static void choose_devnum(struct usb_device *udev)
-+{
-+	int		devnum;
-+	struct usb_bus	*bus = udev->bus;
-+
-+	/* If khubd ever becomes multithreaded, this will need a lock */
-+	if (udev->wusb) {
-+		devnum = udev->portnum + 1;
-+		BUG_ON(test_bit(devnum, bus->devmap.devicemap));
-+	} else {
-+		/* Try to allocate the next devnum beginning at
-+		 * bus->devnum_next. */
-+		devnum = find_next_zero_bit(bus->devmap.devicemap, 128,
-+					    bus->devnum_next);
-+		if (devnum >= 128)
-+			devnum = find_next_zero_bit(bus->devmap.devicemap,
-+						    128, 1);
-+		bus->devnum_next = ( devnum >= 127 ? 1 : devnum + 1);
-+	}
-+	if (devnum < 128) {
-+		set_bit(devnum, bus->devmap.devicemap);
-+		udev->devnum = devnum;
-+	}
-+}
-+
-+static void release_devnum(struct usb_device *udev)
-+{
-+	if (udev->devnum > 0) {
-+		clear_bit(udev->devnum, udev->bus->devmap.devicemap);
-+		udev->devnum = -1;
-+	}
-+}
-+
-+static void update_devnum(struct usb_device *udev, int devnum)
-+{
-+	/* The address for a WUSB device is managed by wusbcore. */
-+	if (!udev->wusb)
-+		udev->devnum = devnum;
-+}
-+
-+static void hub_free_dev(struct usb_device *udev)
-+{
-+	struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-+
-+	/* Root hubs aren't real devices, so don't free HCD resources */
-+	if (hcd->driver->free_dev && udev->parent)
-+		hcd->driver->free_dev(hcd, udev);
-+}
-+
-+/**
-+ * usb_disconnect - disconnect a device (usbcore-internal)
-+ * @pdev: pointer to device being disconnected
-+ * Context: !in_interrupt ()
-+ *
-+ * Something got disconnected. Get rid of it and all of its children.
-+ *
-+ * If *pdev is a normal device then the parent hub must already be locked.
-+ * If *pdev is a root hub then this routine will acquire the
-+ * usb_bus_list_lock on behalf of the caller.
-+ *
-+ * Only hub drivers (including virtual root hub drivers for host
-+ * controllers) should ever call this.
-+ *
-+ * This call is synchronous, and may not be used in an interrupt context.
-+ */
-+void usb_disconnect(struct usb_device **pdev)
-+{
-+	struct usb_device	*udev = *pdev;
-+	int			i;
-+
-+	/* mark the device as inactive, so any further urb submissions for
-+	 * this device (and any of its children) will fail immediately.
-+	 * this quiesces everything except pending urbs.
-+	 */
-+	usb_set_device_state(udev, USB_STATE_NOTATTACHED);
-+	dev_info(&udev->dev, "USB disconnect, device number %d\n",
-+			udev->devnum);
-+
-+	usb_lock_device(udev);
-+
-+	/* Free up all the children before we remove this device */
-+	for (i = 0; i < udev->maxchild; i++) {
-+		if (udev->children[i])
-+			usb_disconnect(&udev->children[i]);
-+	}
-+
-+	/* deallocate hcd/hardware state ... nuking all pending urbs and
-+	 * cleaning up all state associated with the current configuration
-+	 * so that the hardware is now fully quiesced.
-+	 */
-+	dev_dbg (&udev->dev, "unregistering device\n");
-+	usb_disable_device(udev, 0);
-+	usb_hcd_synchronize_unlinks(udev);
-+
-+	usb_remove_ep_devs(&udev->ep0);
-+	usb_unlock_device(udev);
-+
-+	/* Unregister the device.  The device driver is responsible
-+	 * for de-configuring the device and invoking the remove-device
-+	 * notifier chain (used by usbfs and possibly others).
-+	 */
-+	device_del(&udev->dev);
-+
-+	/* Free the device number and delete the parent's children[]
-+	 * (or root_hub) pointer.
-+	 */
-+	release_devnum(udev);
-+
-+	/* Avoid races with recursively_mark_NOTATTACHED() */
-+	spin_lock_irq(&device_state_lock);
-+	*pdev = NULL;
-+	spin_unlock_irq(&device_state_lock);
-+
-+	hub_free_dev(udev);
-+
-+	put_device(&udev->dev);
-+}
-+
-+#ifdef CONFIG_USB_ANNOUNCE_NEW_DEVICES
-+static void show_string(struct usb_device *udev, char *id, char *string)
-+{
-+	if (!string)
-+		return;
-+	dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string);
-+}
-+
-+static void announce_device(struct usb_device *udev)
-+{
-+	dev_info(&udev->dev, "New USB device found, idVendor=%04x, idProduct=%04x\n",
-+		le16_to_cpu(udev->descriptor.idVendor),
-+		le16_to_cpu(udev->descriptor.idProduct));
-+	dev_info(&udev->dev,
-+		"New USB device strings: Mfr=%d, Product=%d, SerialNumber=%d\n",
-+		udev->descriptor.iManufacturer,
-+		udev->descriptor.iProduct,
-+		udev->descriptor.iSerialNumber);
-+	show_string(udev, "Product", udev->product);
-+	show_string(udev, "Manufacturer", udev->manufacturer);
-+	show_string(udev, "SerialNumber", udev->serial);
-+}
-+#else
-+static inline void announce_device(struct usb_device *udev) { }
-+#endif
-+
-+#ifdef	CONFIG_USB_OTG
-+#include "otg_whitelist.h"
-+#endif
-+
-+/**
-+ * usb_enumerate_device_otg - FIXME (usbcore-internal)
-+ * @udev: newly addressed device (in ADDRESS state)
-+ *
-+ * Finish enumeration for On-The-Go devices
-+ */
-+static int usb_enumerate_device_otg(struct usb_device *udev)
-+{
-+	int err = 0;
-+
-+#ifdef	CONFIG_USB_OTG
-+	/*
-+	 * OTG-aware devices on OTG-capable root hubs may be able to use SRP,
-+	 * to wake us after we've powered off VBUS; and HNP, switching roles
-+	 * "host" to "peripheral".  The OTG descriptor helps figure this out.
-+	 */
-+	if (!udev->bus->is_b_host
-+			&& udev->config
-+			&& udev->parent == udev->bus->root_hub) {
-+		struct usb_otg_descriptor	*desc = NULL;
-+		struct usb_bus			*bus = udev->bus;
-+
-+		/* descriptor may appear anywhere in config */
-+		if (__usb_get_extra_descriptor (udev->rawdescriptors[0],
-+					le16_to_cpu(udev->config[0].desc.wTotalLength),
-+					USB_DT_OTG, (void **) &desc) == 0) {
-+			if (desc->bmAttributes & USB_OTG_HNP) {
-+				unsigned		port1 = udev->portnum;
-+
-+				dev_info(&udev->dev,
-+					"Dual-Role OTG device on %sHNP port\n",
-+					(port1 == bus->otg_port)
-+						? "" : "non-");
-+
-+				/* enable HNP before suspend, it's simpler */
-+				if (port1 == bus->otg_port)
-+					bus->b_hnp_enable = 1;
-+				err = usb_control_msg(udev,
-+					usb_sndctrlpipe(udev, 0),
-+					USB_REQ_SET_FEATURE, 0,
-+					bus->b_hnp_enable
-+						? USB_DEVICE_B_HNP_ENABLE
-+						: USB_DEVICE_A_ALT_HNP_SUPPORT,
-+					0, NULL, 0, USB_CTRL_SET_TIMEOUT);
-+				if (err < 0) {
-+					/* OTG MESSAGE: report errors here,
-+					 * customize to match your product.
-+					 */
-+					dev_info(&udev->dev,
-+						"can't set HNP mode: %d\n",
-+						err);
-+					bus->b_hnp_enable = 0;
-+				}
-+			}
-+		}
-+	}
-+
-+	if (!is_targeted(udev)) {
-+
-+		/* Maybe it can talk to us, though we can't talk to it.
-+		 * (Includes HNP test device.)
-+		 */
-+		if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
-+			err = usb_port_suspend(udev, PMSG_SUSPEND);
-+			if (err < 0)
-+				dev_dbg(&udev->dev, "HNP fail, %d\n", err);
-+		}
-+		err = -ENOTSUPP;
-+		goto fail;
-+	}
-+fail:
-+#endif
-+	return err;
-+}
-+
-+
-+/**
-+ * usb_enumerate_device - Read device configs/intfs/otg (usbcore-internal)
-+ * @udev: newly addressed device (in ADDRESS state)
-+ *
-+ * This is only called by usb_new_device() and usb_authorize_device()
-+ * and FIXME -- all comments that apply to them apply here wrt to
-+ * environment.
-+ *
-+ * If the device is WUSB and not authorized, we don't attempt to read
-+ * the string descriptors, as they will be errored out by the device
-+ * until it has been authorized.
-+ */
-+static int usb_enumerate_device(struct usb_device *udev)
-+{
-+	int err;
-+
-+	if (udev->config == NULL) {
-+		err = usb_get_configuration(udev);
-+		if (err < 0) {
-+			dev_err(&udev->dev, "can't read configurations, error %d\n",
-+				err);
-+			return err;
-+		}
-+	}
-+	if (udev->wusb == 1 && udev->authorized == 0) {
-+		udev->product = kstrdup("n/a (unauthorized)", GFP_KERNEL);
-+		udev->manufacturer = kstrdup("n/a (unauthorized)", GFP_KERNEL);
-+		udev->serial = kstrdup("n/a (unauthorized)", GFP_KERNEL);
-+	}
-+	else {
-+		/* read the standard strings and cache them if present */
-+		udev->product = usb_cache_string(udev, udev->descriptor.iProduct);
-+		udev->manufacturer = usb_cache_string(udev,
-+						      udev->descriptor.iManufacturer);
-+		udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber);
-+	}
-+	err = usb_enumerate_device_otg(udev);
-+	if (err < 0)
-+		return err;
-+
-+	usb_detect_interface_quirks(udev);
-+
-+	return 0;
-+}
-+
-+static void set_usb_port_removable(struct usb_device *udev)
-+{
-+	struct usb_device *hdev = udev->parent;
-+	struct usb_hub *hub;
-+	u8 port = udev->portnum;
-+	u16 wHubCharacteristics;
-+	bool removable = true;
-+
-+	if (!hdev)
-+		return;
-+
-+	hub = hdev_to_hub(udev->parent);
-+
-+	wHubCharacteristics = le16_to_cpu(hub->descriptor->wHubCharacteristics);
-+
-+	if (!(wHubCharacteristics & HUB_CHAR_COMPOUND))
-+		return;
-+
-+	if (hub_is_superspeed(hdev)) {
-+		if (hub->descriptor->u.ss.DeviceRemovable & (1 << port))
-+			removable = false;
-+	} else {
-+		if (hub->descriptor->u.hs.DeviceRemovable[port / 8] & (1 << (port % 8)))
-+			removable = false;
-+	}
-+
-+	if (removable)
-+		udev->removable = USB_DEVICE_REMOVABLE;
-+	else
-+		udev->removable = USB_DEVICE_FIXED;
-+}
-+
-+/**
-+ * usb_new_device - perform initial device setup (usbcore-internal)
-+ * @udev: newly addressed device (in ADDRESS state)
-+ *
-+ * This is called with devices which have been detected but not fully
-+ * enumerated.  The device descriptor is available, but not descriptors
-+ * for any device configuration.  The caller must have locked either
-+ * the parent hub (if udev is a normal device) or else the
-+ * usb_bus_list_lock (if udev is a root hub).  The parent's pointer to
-+ * udev has already been installed, but udev is not yet visible through
-+ * sysfs or other filesystem code.
-+ *
-+ * It will return if the device is configured properly or not.  Zero if
-+ * the interface was registered with the driver core; else a negative
-+ * errno value.
-+ *
-+ * This call is synchronous, and may not be used in an interrupt context.
-+ *
-+ * Only the hub driver or root-hub registrar should ever call this.
-+ */
-+int usb_new_device(struct usb_device *udev)
-+{
-+	int err;
-+
-+	if (udev->parent) {
-+		/* Initialize non-root-hub device wakeup to disabled;
-+		 * device (un)configuration controls wakeup capable
-+		 * sysfs power/wakeup controls wakeup enabled/disabled
-+		 */
-+		device_init_wakeup(&udev->dev, 0);
-+	}
-+
-+	/* Tell the runtime-PM framework the device is active */
-+	pm_runtime_set_active(&udev->dev);
-+	pm_runtime_get_noresume(&udev->dev);
-+	pm_runtime_use_autosuspend(&udev->dev);
-+	pm_runtime_enable(&udev->dev);
-+
-+	/* By default, forbid autosuspend for all devices.  It will be
-+	 * allowed for hubs during binding.
-+	 */
-+	usb_disable_autosuspend(udev);
-+
-+	err = usb_enumerate_device(udev);	/* Read descriptors */
-+	if (err < 0)
-+		goto fail;
-+	dev_dbg(&udev->dev, "udev %d, busnum %d, minor = %d\n",
-+			udev->devnum, udev->bus->busnum,
-+			(((udev->bus->busnum-1) * 128) + (udev->devnum-1)));
-+	/* export the usbdev device-node for libusb */
-+	udev->dev.devt = MKDEV(USB_DEVICE_MAJOR,
-+			(((udev->bus->busnum-1) * 128) + (udev->devnum-1)));
-+
-+	/* Tell the world! */
-+	announce_device(udev);
-+
-+	if (udev->serial)
-+		add_device_randomness(udev->serial, strlen(udev->serial));
-+	if (udev->product)
-+		add_device_randomness(udev->product, strlen(udev->product));
-+	if (udev->manufacturer)
-+		add_device_randomness(udev->manufacturer,
-+				      strlen(udev->manufacturer));
-+
-+	device_enable_async_suspend(&udev->dev);
-+
-+	/*
-+	 * check whether the hub marks this port as non-removable. Do it
-+	 * now so that platform-specific data can override it in
-+	 * device_add()
-+	 */
-+	if (udev->parent)
-+		set_usb_port_removable(udev);
-+
-+	/* Register the device.  The device driver is responsible
-+	 * for configuring the device and invoking the add-device
-+	 * notifier chain (used by usbfs and possibly others).
-+	 */
-+	err = device_add(&udev->dev);
-+	if (err) {
-+		dev_err(&udev->dev, "can't device_add, error %d\n", err);
-+		goto fail;
-+	}
-+
-+	(void) usb_create_ep_devs(&udev->dev, &udev->ep0, udev);
-+	usb_mark_last_busy(udev);
-+	pm_runtime_put_sync_autosuspend(&udev->dev);
-+	return err;
-+
-+fail:
-+	usb_set_device_state(udev, USB_STATE_NOTATTACHED);
-+	pm_runtime_disable(&udev->dev);
-+	pm_runtime_set_suspended(&udev->dev);
-+	return err;
-+}
-+
-+
-+/**
-+ * usb_deauthorize_device - deauthorize a device (usbcore-internal)
-+ * @usb_dev: USB device
-+ *
-+ * Move the USB device to a very basic state where interfaces are disabled
-+ * and the device is in fact unconfigured and unusable.
-+ *
-+ * We share a lock (that we have) with device_del(), so we need to
-+ * defer its call.
-+ */
-+int usb_deauthorize_device(struct usb_device *usb_dev)
-+{
-+	usb_lock_device(usb_dev);
-+	if (usb_dev->authorized == 0)
-+		goto out_unauthorized;
-+
-+	usb_dev->authorized = 0;
-+	usb_set_configuration(usb_dev, -1);
-+
-+	kfree(usb_dev->product);
-+	usb_dev->product = kstrdup("n/a (unauthorized)", GFP_KERNEL);
-+	kfree(usb_dev->manufacturer);
-+	usb_dev->manufacturer = kstrdup("n/a (unauthorized)", GFP_KERNEL);
-+	kfree(usb_dev->serial);
-+	usb_dev->serial = kstrdup("n/a (unauthorized)", GFP_KERNEL);
-+
-+	usb_destroy_configuration(usb_dev);
-+	usb_dev->descriptor.bNumConfigurations = 0;
-+
-+out_unauthorized:
-+	usb_unlock_device(usb_dev);
-+	return 0;
-+}
-+
-+
-+int usb_authorize_device(struct usb_device *usb_dev)
-+{
-+	int result = 0, c;
-+
-+	usb_lock_device(usb_dev);
-+	if (usb_dev->authorized == 1)
-+		goto out_authorized;
-+
-+	result = usb_autoresume_device(usb_dev);
-+	if (result < 0) {
-+		dev_err(&usb_dev->dev,
-+			"can't autoresume for authorization: %d\n", result);
-+		goto error_autoresume;
-+	}
-+	result = usb_get_device_descriptor(usb_dev, sizeof(usb_dev->descriptor));
-+	if (result < 0) {
-+		dev_err(&usb_dev->dev, "can't re-read device descriptor for "
-+			"authorization: %d\n", result);
-+		goto error_device_descriptor;
-+	}
-+
-+	kfree(usb_dev->product);
-+	usb_dev->product = NULL;
-+	kfree(usb_dev->manufacturer);
-+	usb_dev->manufacturer = NULL;
-+	kfree(usb_dev->serial);
-+	usb_dev->serial = NULL;
-+
-+	usb_dev->authorized = 1;
-+	result = usb_enumerate_device(usb_dev);
-+	if (result < 0)
-+		goto error_enumerate;
-+	/* Choose and set the configuration.  This registers the interfaces
-+	 * with the driver core and lets interface drivers bind to them.
-+	 */
-+	c = usb_choose_configuration(usb_dev);
-+	if (c >= 0) {
-+		result = usb_set_configuration(usb_dev, c);
-+		if (result) {
-+			dev_err(&usb_dev->dev,
-+				"can't set config #%d, error %d\n", c, result);
-+			/* This need not be fatal.  The user can try to
-+			 * set other configurations. */
-+		}
-+	}
-+	dev_info(&usb_dev->dev, "authorized to connect\n");
-+
-+error_enumerate:
-+error_device_descriptor:
-+	usb_autosuspend_device(usb_dev);
-+error_autoresume:
-+out_authorized:
-+	usb_unlock_device(usb_dev);	// complements locktree
-+	return result;
-+}
-+
-+
-+/* Returns 1 if @hub is a WUSB root hub, 0 otherwise */
-+static unsigned hub_is_wusb(struct usb_hub *hub)
-+{
-+	struct usb_hcd *hcd;
-+	if (hub->hdev->parent != NULL)  /* not a root hub? */
-+		return 0;
-+	hcd = container_of(hub->hdev->bus, struct usb_hcd, self);
-+	return hcd->wireless;
-+}
-+
-+
-+#define PORT_RESET_TRIES	5
-+#define SET_ADDRESS_TRIES	2
-+#define GET_DESCRIPTOR_TRIES	2
-+#define SET_CONFIG_TRIES	(2 * (use_both_schemes + 1))
-+#define USE_NEW_SCHEME(i)	((i) / 2 == (int)old_scheme_first)
-+
-+#define HUB_ROOT_RESET_TIME	50	/* times are in msec */
-+#define HUB_SHORT_RESET_TIME	10
-+#define HUB_BH_RESET_TIME	50
-+#define HUB_LONG_RESET_TIME	200
-+#define HUB_RESET_TIMEOUT	500
-+
-+static int hub_port_reset(struct usb_hub *hub, int port1,
-+			struct usb_device *udev, unsigned int delay, bool warm);
-+
-+/* Is a USB 3.0 port in the Inactive or Complinance Mode state?
-+ * Port worm reset is required to recover
-+ */
-+static bool hub_port_warm_reset_required(struct usb_hub *hub, u16 portstatus)
-+{
-+	return hub_is_superspeed(hub->hdev) &&
-+		(((portstatus & USB_PORT_STAT_LINK_STATE) ==
-+		  USB_SS_PORT_LS_SS_INACTIVE) ||
-+		 ((portstatus & USB_PORT_STAT_LINK_STATE) ==
-+		  USB_SS_PORT_LS_COMP_MOD)) ;
-+}
-+
-+static int hub_port_wait_reset(struct usb_hub *hub, int port1,
-+			struct usb_device *udev, unsigned int delay, bool warm)
-+{
-+	int delay_time, ret;
-+	u16 portstatus;
-+	u16 portchange;
-+
-+	for (delay_time = 0;
-+			delay_time < HUB_RESET_TIMEOUT;
-+			delay_time += delay) {
-+		/* wait to give the device a chance to reset */
-+		msleep(delay);
-+
-+		/* read and decode port status */
-+		ret = hub_port_status(hub, port1, &portstatus, &portchange);
-+		if (ret < 0)
-+			return ret;
-+
-+		/*
-+		 * Some buggy devices require a warm reset to be issued even
-+		 * when the port appears not to be connected.
-+		 */
-+		if (!warm) {
-+			/*
-+			 * Some buggy devices can cause an NEC host controller
-+			 * to transition to the "Error" state after a hot port
-+			 * reset.  This will show up as the port state in
-+			 * "Inactive", and the port may also report a
-+			 * disconnect.  Forcing a warm port reset seems to make
-+			 * the device work.
-+			 *
-+			 * See https://bugzilla.kernel.org/show_bug.cgi?id=41752
-+			 */
-+			if (hub_port_warm_reset_required(hub, portstatus)) {
-+				int ret;
-+
-+				if ((portchange & USB_PORT_STAT_C_CONNECTION))
-+					clear_port_feature(hub->hdev, port1,
-+							USB_PORT_FEAT_C_CONNECTION);
-+				if (portchange & USB_PORT_STAT_C_LINK_STATE)
-+					clear_port_feature(hub->hdev, port1,
-+							USB_PORT_FEAT_C_PORT_LINK_STATE);
-+				if (portchange & USB_PORT_STAT_C_RESET)
-+					clear_port_feature(hub->hdev, port1,
-+							USB_PORT_FEAT_C_RESET);
-+				dev_dbg(hub->intfdev, "hot reset failed, warm reset port %d\n",
-+						port1);
-+				ret = hub_port_reset(hub, port1,
-+						udev, HUB_BH_RESET_TIME,
-+						true);
-+				if ((portchange & USB_PORT_STAT_C_CONNECTION))
-+					clear_port_feature(hub->hdev, port1,
-+							USB_PORT_FEAT_C_CONNECTION);
-+				return ret;
-+			}
-+			/* Device went away? */
-+			if (!(portstatus & USB_PORT_STAT_CONNECTION))
-+				return -ENOTCONN;
-+
-+			/* bomb out completely if the connection bounced */
-+			if ((portchange & USB_PORT_STAT_C_CONNECTION))
-+				return -ENOTCONN;
-+
-+			/* if we`ve finished resetting, then break out of
-+			 * the loop
-+			 */
-+			if (!(portstatus & USB_PORT_STAT_RESET) &&
-+			    (portstatus & USB_PORT_STAT_ENABLE)) {
-+				if (hub_is_wusb(hub))
-+					udev->speed = USB_SPEED_WIRELESS;
-+				else if (hub_is_superspeed(hub->hdev))
-+					udev->speed = USB_SPEED_SUPER;
-+				else if (portstatus & USB_PORT_STAT_HIGH_SPEED)
-+					udev->speed = USB_SPEED_HIGH;
-+				else if (portstatus & USB_PORT_STAT_LOW_SPEED)
-+					udev->speed = USB_SPEED_LOW;
-+				else
-+					udev->speed = USB_SPEED_FULL;
-+				return 0;
-+			}
-+		} else {
-+			if (portchange & USB_PORT_STAT_C_BH_RESET)
-+				return 0;
-+		}
-+
-+		/* switch to the long delay after two short delay failures */
-+		if (delay_time >= 2 * HUB_SHORT_RESET_TIME)
-+			delay = HUB_LONG_RESET_TIME;
-+
-+		dev_dbg (hub->intfdev,
-+			"port %d not %sreset yet, waiting %dms\n",
-+			port1, warm ? "warm " : "", delay);
-+	}
-+
-+	return -EBUSY;
-+}
-+
-+static void hub_port_finish_reset(struct usb_hub *hub, int port1,
-+			struct usb_device *udev, int *status, bool warm)
-+{
-+	switch (*status) {
-+	case 0:
-+		if (!warm) {
-+			struct usb_hcd *hcd;
-+			/* TRSTRCY = 10 ms; plus some extra */
-+			msleep(10 + 40);
-+			update_devnum(udev, 0);
-+			hcd = bus_to_hcd(udev->bus);
-+			if (hcd->driver->reset_device) {
-+				*status = hcd->driver->reset_device(hcd, udev);
-+				if (*status < 0) {
-+					dev_err(&udev->dev, "Cannot reset "
-+							"HCD device state\n");
-+					break;
-+				}
-+			}
-+		}
-+		/* FALL THROUGH */
-+	case -ENOTCONN:
-+	case -ENODEV:
-+		clear_port_feature(hub->hdev,
-+				port1, USB_PORT_FEAT_C_RESET);
-+		/* FIXME need disconnect() for NOTATTACHED device */
-+		if (warm) {
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_BH_PORT_RESET);
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_PORT_LINK_STATE);
-+		} else {
-+			usb_set_device_state(udev, *status
-+					? USB_STATE_NOTATTACHED
-+					: USB_STATE_DEFAULT);
-+		}
-+		break;
-+	}
-+}
-+
-+/* Handle port reset and port warm(BH) reset (for USB3 protocol ports) */
-+static int hub_port_reset(struct usb_hub *hub, int port1,
-+			struct usb_device *udev, unsigned int delay, bool warm)
-+{
-+	int i, status;
-+
-+	if (!warm) {
-+		/* Block EHCI CF initialization during the port reset.
-+		 * Some companion controllers don't like it when they mix.
-+		 */
-+		down_read(&ehci_cf_port_reset_rwsem);
-+	} else {
-+		if (!hub_is_superspeed(hub->hdev)) {
-+			dev_err(hub->intfdev, "only USB3 hub support "
-+						"warm reset\n");
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* Reset the port */
-+	for (i = 0; i < PORT_RESET_TRIES; i++) {
-+		status = set_port_feature(hub->hdev, port1, (warm ?
-+					USB_PORT_FEAT_BH_PORT_RESET :
-+					USB_PORT_FEAT_RESET));
-+		if (status) {
-+			dev_err(hub->intfdev,
-+					"cannot %sreset port %d (err = %d)\n",
-+					warm ? "warm " : "", port1, status);
-+		} else {
-+			status = hub_port_wait_reset(hub, port1, udev, delay,
-+								warm);
-+			if (status && status != -ENOTCONN)
-+				dev_dbg(hub->intfdev,
-+						"port_wait_reset: err = %d\n",
-+						status);
-+		}
-+
-+		/* return on disconnect or reset */
-+		if (status == 0 || status == -ENOTCONN || status == -ENODEV) {
-+			hub_port_finish_reset(hub, port1, udev, &status, warm);
-+			goto done;
-+		}
-+
-+		dev_dbg (hub->intfdev,
-+			"port %d not enabled, trying %sreset again...\n",
-+			port1, warm ? "warm " : "");
-+		delay = HUB_LONG_RESET_TIME;
-+	}
-+
-+	dev_err (hub->intfdev,
-+		"Cannot enable port %i.  Maybe the USB cable is bad?\n",
-+		port1);
-+
-+done:
-+	if (!warm)
-+		up_read(&ehci_cf_port_reset_rwsem);
-+
-+	return status;
-+}
-+
-+/* Check if a port is power on */
-+static int port_is_power_on(struct usb_hub *hub, unsigned portstatus)
-+{
-+	int ret = 0;
-+
-+	if (hub_is_superspeed(hub->hdev)) {
-+		if (portstatus & USB_SS_PORT_STAT_POWER)
-+			ret = 1;
-+	} else {
-+		if (portstatus & USB_PORT_STAT_POWER)
-+			ret = 1;
-+	}
-+
-+	return ret;
-+}
-+
-+#ifdef	CONFIG_PM
-+
-+/* Check if a port is suspended(USB2.0 port) or in U3 state(USB3.0 port) */
-+static int port_is_suspended(struct usb_hub *hub, unsigned portstatus)
-+{
-+	int ret = 0;
-+
-+	if (hub_is_superspeed(hub->hdev)) {
-+		if ((portstatus & USB_PORT_STAT_LINK_STATE)
-+				== USB_SS_PORT_LS_U3)
-+			ret = 1;
-+	} else {
-+		if (portstatus & USB_PORT_STAT_SUSPEND)
-+			ret = 1;
-+	}
-+
-+	return ret;
-+}
-+
-+/* Determine whether the device on a port is ready for a normal resume,
-+ * is ready for a reset-resume, or should be disconnected.
-+ */
-+static int check_port_resume_type(struct usb_device *udev,
-+		struct usb_hub *hub, int port1,
-+		int status, unsigned portchange, unsigned portstatus)
-+{
-+	/* Is the device still present? */
-+	if (status || port_is_suspended(hub, portstatus) ||
-+			!port_is_power_on(hub, portstatus) ||
-+			!(portstatus & USB_PORT_STAT_CONNECTION)) {
-+		if (status >= 0)
-+			status = -ENODEV;
-+	}
-+
-+	/* Can't do a normal resume if the port isn't enabled,
-+	 * so try a reset-resume instead.
-+	 */
-+	else if (!(portstatus & USB_PORT_STAT_ENABLE) && !udev->reset_resume) {
-+		if (udev->persist_enabled)
-+			udev->reset_resume = 1;
-+		else
-+			status = -ENODEV;
-+	}
-+
-+	if (status) {
-+		dev_dbg(hub->intfdev,
-+				"port %d status %04x.%04x after resume, %d\n",
-+				port1, portchange, portstatus, status);
-+	} else if (udev->reset_resume) {
-+
-+		/* Late port handoff can set status-change bits */
-+		if (portchange & USB_PORT_STAT_C_CONNECTION)
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_CONNECTION);
-+		if (portchange & USB_PORT_STAT_C_ENABLE)
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_ENABLE);
-+	}
-+
-+	return status;
-+}
-+
-+int usb_disable_ltm(struct usb_device *udev)
-+{
-+	struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-+
-+	/* Check if the roothub and device supports LTM. */
-+	if (!usb_device_supports_ltm(hcd->self.root_hub) ||
-+			!usb_device_supports_ltm(udev))
-+		return 0;
-+
-+	/* Clear Feature LTM Enable can only be sent if the device is
-+	 * configured.
-+	 */
-+	if (!udev->actconfig)
-+		return 0;
-+
-+	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+			USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
-+			USB_DEVICE_LTM_ENABLE, 0, NULL, 0,
-+			USB_CTRL_SET_TIMEOUT);
-+}
-+EXPORT_SYMBOL_GPL(usb_disable_ltm);
-+
-+void usb_enable_ltm(struct usb_device *udev)
-+{
-+	struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-+
-+	/* Check if the roothub and device supports LTM. */
-+	if (!usb_device_supports_ltm(hcd->self.root_hub) ||
-+			!usb_device_supports_ltm(udev))
-+		return;
-+
-+	/* Set Feature LTM Enable can only be sent if the device is
-+	 * configured.
-+	 */
-+	if (!udev->actconfig)
-+		return;
-+
-+	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+			USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,
-+			USB_DEVICE_LTM_ENABLE, 0, NULL, 0,
-+			USB_CTRL_SET_TIMEOUT);
-+}
-+EXPORT_SYMBOL_GPL(usb_enable_ltm);
-+
-+#ifdef	CONFIG_USB_SUSPEND
-+
-+/*
-+ * usb_port_suspend - suspend a usb device's upstream port
-+ * @udev: device that's no longer in active use, not a root hub
-+ * Context: must be able to sleep; device not locked; pm locks held
-+ *
-+ * Suspends a USB device that isn't in active use, conserving power.
-+ * Devices may wake out of a suspend, if anything important happens,
-+ * using the remote wakeup mechanism.  They may also be taken out of
-+ * suspend by the host, using usb_port_resume().  It's also routine
-+ * to disconnect devices while they are suspended.
-+ *
-+ * This only affects the USB hardware for a device; its interfaces
-+ * (and, for hubs, child devices) must already have been suspended.
-+ *
-+ * Selective port suspend reduces power; most suspended devices draw
-+ * less than 500 uA.  It's also used in OTG, along with remote wakeup.
-+ * All devices below the suspended port are also suspended.
-+ *
-+ * Devices leave suspend state when the host wakes them up.  Some devices
-+ * also support "remote wakeup", where the device can activate the USB
-+ * tree above them to deliver data, such as a keypress or packet.  In
-+ * some cases, this wakes the USB host.
-+ *
-+ * Suspending OTG devices may trigger HNP, if that's been enabled
-+ * between a pair of dual-role devices.  That will change roles, such
-+ * as from A-Host to A-Peripheral or from B-Host back to B-Peripheral.
-+ *
-+ * Devices on USB hub ports have only one "suspend" state, corresponding
-+ * to ACPI D2, "may cause the device to lose some context".
-+ * State transitions include:
-+ *
-+ *   - suspend, resume ... when the VBUS power link stays live
-+ *   - suspend, disconnect ... VBUS lost
-+ *
-+ * Once VBUS drop breaks the circuit, the port it's using has to go through
-+ * normal re-enumeration procedures, starting with enabling VBUS power.
-+ * Other than re-initializing the hub (plug/unplug, except for root hubs),
-+ * Linux (2.6) currently has NO mechanisms to initiate that:  no khubd
-+ * timer, no SRP, no requests through sysfs.
-+ *
-+ * If CONFIG_USB_SUSPEND isn't enabled, devices only really suspend when
-+ * the root hub for their bus goes into global suspend ... so we don't
-+ * (falsely) update the device power state to say it suspended.
-+ *
-+ * Returns 0 on success, else negative errno.
-+ */
-+int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
-+{
-+	struct usb_hub	*hub = hdev_to_hub(udev->parent);
-+	int		port1 = udev->portnum;
-+	int		status;
-+
-+	/* enable remote wakeup when appropriate; this lets the device
-+	 * wake up the upstream hub (including maybe the root hub).
-+	 *
-+	 * NOTE:  OTG devices may issue remote wakeup (or SRP) even when
-+	 * we don't explicitly enable it here.
-+	 */
-+	if (udev->do_remote_wakeup) {
-+		if (!hub_is_superspeed(hub->hdev)) {
-+			status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+					USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,
-+					USB_DEVICE_REMOTE_WAKEUP, 0,
-+					NULL, 0,
-+					USB_CTRL_SET_TIMEOUT);
-+		} else {
-+			/* Assume there's only one function on the USB 3.0
-+			 * device and enable remote wake for the first
-+			 * interface. FIXME if the interface association
-+			 * descriptor shows there's more than one function.
-+			 */
-+			status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+					USB_REQ_SET_FEATURE,
-+					USB_RECIP_INTERFACE,
-+					USB_INTRF_FUNC_SUSPEND,
-+					USB_INTRF_FUNC_SUSPEND_RW |
-+					USB_INTRF_FUNC_SUSPEND_LP,
-+					NULL, 0,
-+					USB_CTRL_SET_TIMEOUT);
-+		}
-+		if (status) {
-+			dev_dbg(&udev->dev, "won't remote wakeup, status %d\n",
-+					status);
-+			/* bail if autosuspend is requested */
-+			if (PMSG_IS_AUTO(msg))
-+				return status;
-+		}
-+	}
-+
-+	/* disable USB2 hardware LPM */
-+	if (udev->usb2_hw_lpm_enabled == 1)
-+		usb_set_usb2_hardware_lpm(udev, 0);
-+
-+	if (usb_disable_ltm(udev)) {
-+		dev_err(&udev->dev, "%s Failed to disable LTM before suspend\n.",
-+				__func__);
-+		return -ENOMEM;
-+	}
-+	if (usb_unlocked_disable_lpm(udev)) {
-+		dev_err(&udev->dev, "%s Failed to disable LPM before suspend\n.",
-+				__func__);
-+		return -ENOMEM;
-+	}
-+
-+	/* see 7.1.7.6 */
-+	if (hub_is_superspeed(hub->hdev))
-+		status = set_port_feature(hub->hdev,
-+				port1 | (USB_SS_PORT_LS_U3 << 3),
-+				USB_PORT_FEAT_LINK_STATE);
-+	else
-+		status = set_port_feature(hub->hdev, port1,
-+						USB_PORT_FEAT_SUSPEND);
-+	if (status) {
-+		dev_dbg(hub->intfdev, "can't suspend port %d, status %d\n",
-+				port1, status);
-+		/* paranoia:  "should not happen" */
-+		if (udev->do_remote_wakeup)
-+			(void) usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+				USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
-+				USB_DEVICE_REMOTE_WAKEUP, 0,
-+				NULL, 0,
-+				USB_CTRL_SET_TIMEOUT);
-+
-+		/* Try to enable USB2 hardware LPM again */
-+		if (udev->usb2_hw_lpm_capable == 1)
-+			usb_set_usb2_hardware_lpm(udev, 1);
-+
-+		/* Try to enable USB3 LTM and LPM again */
-+		usb_enable_ltm(udev);
-+		usb_unlocked_enable_lpm(udev);
-+
-+		/* System sleep transitions should never fail */
-+		if (!PMSG_IS_AUTO(msg))
-+			status = 0;
-+	} else {
-+		/* device has up to 10 msec to fully suspend */
-+		dev_dbg(&udev->dev, "usb %ssuspend, wakeup %d\n",
-+				(PMSG_IS_AUTO(msg) ? "auto-" : ""),
-+				udev->do_remote_wakeup);
-+		usb_set_device_state(udev, USB_STATE_SUSPENDED);
-+		msleep(10);
-+	}
-+	usb_mark_last_busy(hub->hdev);
-+	return status;
-+}
-+
-+/*
-+ * If the USB "suspend" state is in use (rather than "global suspend"),
-+ * many devices will be individually taken out of suspend state using
-+ * special "resume" signaling.  This routine kicks in shortly after
-+ * hardware resume signaling is finished, either because of selective
-+ * resume (by host) or remote wakeup (by device) ... now see what changed
-+ * in the tree that's rooted at this device.
-+ *
-+ * If @udev->reset_resume is set then the device is reset before the
-+ * status check is done.
-+ */
-+static int finish_port_resume(struct usb_device *udev)
-+{
-+	int	status = 0;
-+	u16	devstatus;
-+
-+	/* caller owns the udev device lock */
-+	dev_dbg(&udev->dev, "%s\n",
-+		udev->reset_resume ? "finish reset-resume" : "finish resume");
-+
-+	/* usb ch9 identifies four variants of SUSPENDED, based on what
-+	 * state the device resumes to.  Linux currently won't see the
-+	 * first two on the host side; they'd be inside hub_port_init()
-+	 * during many timeouts, but khubd can't suspend until later.
-+	 */
-+	usb_set_device_state(udev, udev->actconfig
-+			? USB_STATE_CONFIGURED
-+			: USB_STATE_ADDRESS);
-+
-+	/* 10.5.4.5 says not to reset a suspended port if the attached
-+	 * device is enabled for remote wakeup.  Hence the reset
-+	 * operation is carried out here, after the port has been
-+	 * resumed.
-+	 */
-+	if (udev->reset_resume)
-+ retry_reset_resume:
-+		status = usb_reset_and_verify_device(udev);
-+
-+ 	/* 10.5.4.5 says be sure devices in the tree are still there.
-+ 	 * For now let's assume the device didn't go crazy on resume,
-+	 * and device drivers will know about any resume quirks.
-+	 */
-+	if (status == 0) {
-+		devstatus = 0;
-+		status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
-+		if (status >= 0)
-+			status = (status > 0 ? 0 : -ENODEV);
-+
-+		/* If a normal resume failed, try doing a reset-resume */
-+		if (status && !udev->reset_resume && udev->persist_enabled) {
-+			dev_dbg(&udev->dev, "retry with reset-resume\n");
-+			udev->reset_resume = 1;
-+			goto retry_reset_resume;
-+		}
-+	}
-+
-+	if (status) {
-+		dev_dbg(&udev->dev, "gone after usb resume? status %d\n",
-+				status);
-+	} else if (udev->actconfig) {
-+		le16_to_cpus(&devstatus);
-+		if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) {
-+			status = usb_control_msg(udev,
-+					usb_sndctrlpipe(udev, 0),
-+					USB_REQ_CLEAR_FEATURE,
-+						USB_RECIP_DEVICE,
-+					USB_DEVICE_REMOTE_WAKEUP, 0,
-+					NULL, 0,
-+					USB_CTRL_SET_TIMEOUT);
-+			if (status)
-+				dev_dbg(&udev->dev,
-+					"disable remote wakeup, status %d\n",
-+					status);
-+		}
-+		status = 0;
-+	}
-+	return status;
-+}
-+
-+/*
-+ * usb_port_resume - re-activate a suspended usb device's upstream port
-+ * @udev: device to re-activate, not a root hub
-+ * Context: must be able to sleep; device not locked; pm locks held
-+ *
-+ * This will re-activate the suspended device, increasing power usage
-+ * while letting drivers communicate again with its endpoints.
-+ * USB resume explicitly guarantees that the power session between
-+ * the host and the device is the same as it was when the device
-+ * suspended.
-+ *
-+ * If @udev->reset_resume is set then this routine won't check that the
-+ * port is still enabled.  Furthermore, finish_port_resume() above will
-+ * reset @udev.  The end result is that a broken power session can be
-+ * recovered and @udev will appear to persist across a loss of VBUS power.
-+ *
-+ * For example, if a host controller doesn't maintain VBUS suspend current
-+ * during a system sleep or is reset when the system wakes up, all the USB
-+ * power sessions below it will be broken.  This is especially troublesome
-+ * for mass-storage devices containing mounted filesystems, since the
-+ * device will appear to have disconnected and all the memory mappings
-+ * to it will be lost.  Using the USB_PERSIST facility, the device can be
-+ * made to appear as if it had not disconnected.
-+ *
-+ * This facility can be dangerous.  Although usb_reset_and_verify_device() makes
-+ * every effort to insure that the same device is present after the
-+ * reset as before, it cannot provide a 100% guarantee.  Furthermore it's
-+ * quite possible for a device to remain unaltered but its media to be
-+ * changed.  If the user replaces a flash memory card while the system is
-+ * asleep, he will have only himself to blame when the filesystem on the
-+ * new card is corrupted and the system crashes.
-+ *
-+ * Returns 0 on success, else negative errno.
-+ */
-+int usb_port_resume(struct usb_device *udev, pm_message_t msg)
-+{
-+	struct usb_hub	*hub = hdev_to_hub(udev->parent);
-+	int		port1 = udev->portnum;
-+	int		status;
-+	u16		portchange, portstatus;
-+
-+	/* Skip the initial Clear-Suspend step for a remote wakeup */
-+	status = hub_port_status(hub, port1, &portstatus, &portchange);
-+	if (status == 0 && !port_is_suspended(hub, portstatus))
-+		goto SuspendCleared;
-+
-+	// dev_dbg(hub->intfdev, "resume port %d\n", port1);
-+
-+	set_bit(port1, hub->busy_bits);
-+
-+	/* see 7.1.7.7; affects power usage, but not budgeting */
-+	if (hub_is_superspeed(hub->hdev))
-+		status = set_port_feature(hub->hdev,
-+				port1 | (USB_SS_PORT_LS_U0 << 3),
-+				USB_PORT_FEAT_LINK_STATE);
-+	else
-+		status = clear_port_feature(hub->hdev,
-+				port1, USB_PORT_FEAT_SUSPEND);
-+	if (status) {
-+		dev_dbg(hub->intfdev, "can't resume port %d, status %d\n",
-+				port1, status);
-+	} else {
-+		/* drive resume for at least 20 msec */
-+		dev_dbg(&udev->dev, "usb %sresume\n",
-+				(PMSG_IS_AUTO(msg) ? "auto-" : ""));
-+		msleep(25);
-+
-+		/* Virtual root hubs can trigger on GET_PORT_STATUS to
-+		 * stop resume signaling.  Then finish the resume
-+		 * sequence.
-+		 */
-+		status = hub_port_status(hub, port1, &portstatus, &portchange);
-+
-+		/* TRSMRCY = 10 msec */
-+		msleep(10);
-+	}
-+
-+ SuspendCleared:
-+	if (status == 0) {
-+		if (hub_is_superspeed(hub->hdev)) {
-+			if (portchange & USB_PORT_STAT_C_LINK_STATE)
-+				clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_PORT_LINK_STATE);
-+		} else {
-+			if (portchange & USB_PORT_STAT_C_SUSPEND)
-+				clear_port_feature(hub->hdev, port1,
-+						USB_PORT_FEAT_C_SUSPEND);
-+		}
-+	}
-+
-+	clear_bit(port1, hub->busy_bits);
-+
-+	status = check_port_resume_type(udev,
-+			hub, port1, status, portchange, portstatus);
-+	if (status == 0)
-+		status = finish_port_resume(udev);
-+	if (status < 0) {
-+		dev_dbg(&udev->dev, "can't resume, status %d\n", status);
-+		hub_port_logical_disconnect(hub, port1);
-+	} else  {
-+		/* Try to enable USB2 hardware LPM */
-+		if (udev->usb2_hw_lpm_capable == 1)
-+			usb_set_usb2_hardware_lpm(udev, 1);
-+
-+		/* Try to enable USB3 LTM and LPM */
-+		usb_enable_ltm(udev);
-+		usb_unlocked_enable_lpm(udev);
-+	}
-+
-+	return status;
-+}
-+
-+/* caller has locked udev */
-+int usb_remote_wakeup(struct usb_device *udev)
-+{
-+	int	status = 0;
-+
-+	if (udev->state == USB_STATE_SUSPENDED) {
-+		dev_dbg(&udev->dev, "usb %sresume\n", "wakeup-");
-+		status = usb_autoresume_device(udev);
-+		if (status == 0) {
-+			/* Let the drivers do their thing, then... */
-+			usb_autosuspend_device(udev);
-+		}
-+	}
-+	return status;
-+}
-+
-+#else	/* CONFIG_USB_SUSPEND */
-+
-+/* When CONFIG_USB_SUSPEND isn't set, we never suspend or resume any ports. */
-+
-+int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
-+{
-+	return 0;
-+}
-+
-+/* However we may need to do a reset-resume */
-+
-+int usb_port_resume(struct usb_device *udev, pm_message_t msg)
-+{
-+	struct usb_hub	*hub = hdev_to_hub(udev->parent);
-+	int		port1 = udev->portnum;
-+	int		status;
-+	u16		portchange, portstatus;
-+
-+	status = hub_port_status(hub, port1, &portstatus, &portchange);
-+	status = check_port_resume_type(udev,
-+			hub, port1, status, portchange, portstatus);
-+
-+	if (status) {
-+		dev_dbg(&udev->dev, "can't resume, status %d\n", status);
-+		hub_port_logical_disconnect(hub, port1);
-+	} else if (udev->reset_resume) {
-+		dev_dbg(&udev->dev, "reset-resume\n");
-+		status = usb_reset_and_verify_device(udev);
-+	}
-+	return status;
-+}
-+
-+#endif
-+
-+static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
-+{
-+	struct usb_hub		*hub = usb_get_intfdata (intf);
-+	struct usb_device	*hdev = hub->hdev;
-+	unsigned		port1;
-+	int			status;
-+
-+	/* Warn if children aren't already suspended */
-+	for (port1 = 1; port1 <= hdev->maxchild; port1++) {
-+		struct usb_device	*udev;
-+
-+		udev = hdev->children [port1-1];
-+		if (udev && udev->can_submit) {
-+			dev_warn(&intf->dev, "port %d nyet suspended\n", port1);
-+			if (PMSG_IS_AUTO(msg))
-+				return -EBUSY;
-+		}
-+	}
-+	if (hub_is_superspeed(hdev) && hdev->do_remote_wakeup) {
-+		/* Enable hub to send remote wakeup for all ports. */
-+		for (port1 = 1; port1 <= hdev->maxchild; port1++) {
-+			status = set_port_feature(hdev,
-+					port1 |
-+					USB_PORT_FEAT_REMOTE_WAKE_CONNECT |
-+					USB_PORT_FEAT_REMOTE_WAKE_DISCONNECT |
-+					USB_PORT_FEAT_REMOTE_WAKE_OVER_CURRENT,
-+					USB_PORT_FEAT_REMOTE_WAKE_MASK);
-+		}
-+	}
-+
-+	dev_dbg(&intf->dev, "%s\n", __func__);
-+
-+	/* stop khubd and related activity */
-+	hub_quiesce(hub, HUB_SUSPEND);
-+	return 0;
-+}
-+
-+static int hub_resume(struct usb_interface *intf)
-+{
-+	struct usb_hub *hub = usb_get_intfdata(intf);
-+
-+	dev_dbg(&intf->dev, "%s\n", __func__);
-+	hub_activate(hub, HUB_RESUME);
-+	return 0;
-+}
-+
-+static int hub_reset_resume(struct usb_interface *intf)
-+{
-+	struct usb_hub *hub = usb_get_intfdata(intf);
-+
-+	dev_dbg(&intf->dev, "%s\n", __func__);
-+	hub_activate(hub, HUB_RESET_RESUME);
-+	return 0;
-+}
-+
-+/**
-+ * usb_root_hub_lost_power - called by HCD if the root hub lost Vbus power
-+ * @rhdev: struct usb_device for the root hub
-+ *
-+ * The USB host controller driver calls this function when its root hub
-+ * is resumed and Vbus power has been interrupted or the controller
-+ * has been reset.  The routine marks @rhdev as having lost power.
-+ * When the hub driver is resumed it will take notice and carry out
-+ * power-session recovery for all the "USB-PERSIST"-enabled child devices;
-+ * the others will be disconnected.
-+ */
-+void usb_root_hub_lost_power(struct usb_device *rhdev)
-+{
-+	dev_warn(&rhdev->dev, "root hub lost power or was reset\n");
-+	rhdev->reset_resume = 1;
-+}
-+EXPORT_SYMBOL_GPL(usb_root_hub_lost_power);
-+
-+static const char * const usb3_lpm_names[]  = {
-+	"U0",
-+	"U1",
-+	"U2",
-+	"U3",
-+};
-+
-+/*
-+ * Send a Set SEL control transfer to the device, prior to enabling
-+ * device-initiated U1 or U2.  This lets the device know the exit latencies from
-+ * the time the device initiates a U1 or U2 exit, to the time it will receive a
-+ * packet from the host.
-+ *
-+ * This function will fail if the SEL or PEL values for udev are greater than
-+ * the maximum allowed values for the link state to be enabled.
-+ */
-+static int usb_req_set_sel(struct usb_device *udev, enum usb3_link_state state)
-+{
-+	struct usb_set_sel_req *sel_values;
-+	unsigned long long u1_sel;
-+	unsigned long long u1_pel;
-+	unsigned long long u2_sel;
-+	unsigned long long u2_pel;
-+	int ret;
-+
-+	/* Convert SEL and PEL stored in ns to us */
-+	u1_sel = DIV_ROUND_UP(udev->u1_params.sel, 1000);
-+	u1_pel = DIV_ROUND_UP(udev->u1_params.pel, 1000);
-+	u2_sel = DIV_ROUND_UP(udev->u2_params.sel, 1000);
-+	u2_pel = DIV_ROUND_UP(udev->u2_params.pel, 1000);
-+
-+	/*
-+	 * Make sure that the calculated SEL and PEL values for the link
-+	 * state we're enabling aren't bigger than the max SEL/PEL
-+	 * value that will fit in the SET SEL control transfer.
-+	 * Otherwise the device would get an incorrect idea of the exit
-+	 * latency for the link state, and could start a device-initiated
-+	 * U1/U2 when the exit latencies are too high.
-+	 */
-+	if ((state == USB3_LPM_U1 &&
-+				(u1_sel > USB3_LPM_MAX_U1_SEL_PEL ||
-+				 u1_pel > USB3_LPM_MAX_U1_SEL_PEL)) ||
-+			(state == USB3_LPM_U2 &&
-+			 (u2_sel > USB3_LPM_MAX_U2_SEL_PEL ||
-+			  u2_pel > USB3_LPM_MAX_U2_SEL_PEL))) {
-+		dev_dbg(&udev->dev, "Device-initiated %s disabled due "
-+				"to long SEL %llu ms or PEL %llu ms\n",
-+				usb3_lpm_names[state], u1_sel, u1_pel);
-+		return -EINVAL;
-+	}
-+
-+	/*
-+	 * If we're enabling device-initiated LPM for one link state,
-+	 * but the other link state has a too high SEL or PEL value,
-+	 * just set those values to the max in the Set SEL request.
-+	 */
-+	if (u1_sel > USB3_LPM_MAX_U1_SEL_PEL)
-+		u1_sel = USB3_LPM_MAX_U1_SEL_PEL;
-+
-+	if (u1_pel > USB3_LPM_MAX_U1_SEL_PEL)
-+		u1_pel = USB3_LPM_MAX_U1_SEL_PEL;
-+
-+	if (u2_sel > USB3_LPM_MAX_U2_SEL_PEL)
-+		u2_sel = USB3_LPM_MAX_U2_SEL_PEL;
-+
-+	if (u2_pel > USB3_LPM_MAX_U2_SEL_PEL)
-+		u2_pel = USB3_LPM_MAX_U2_SEL_PEL;
-+
-+	/*
-+	 * usb_enable_lpm() can be called as part of a failed device reset,
-+	 * which may be initiated by an error path of a mass storage driver.
-+	 * Therefore, use GFP_NOIO.
-+	 */
-+	sel_values = kmalloc(sizeof *(sel_values), GFP_NOIO);
-+	if (!sel_values)
-+		return -ENOMEM;
-+
-+	sel_values->u1_sel = u1_sel;
-+	sel_values->u1_pel = u1_pel;
-+	sel_values->u2_sel = cpu_to_le16(u2_sel);
-+	sel_values->u2_pel = cpu_to_le16(u2_pel);
-+
-+	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+			USB_REQ_SET_SEL,
-+			USB_RECIP_DEVICE,
-+			0, 0,
-+			sel_values, sizeof *(sel_values),
-+			USB_CTRL_SET_TIMEOUT);
-+	kfree(sel_values);
-+	return ret;
-+}
-+
-+/*
-+ * Enable or disable device-initiated U1 or U2 transitions.
-+ */
-+static int usb_set_device_initiated_lpm(struct usb_device *udev,
-+		enum usb3_link_state state, bool enable)
-+{
-+	int ret;
-+	int feature;
-+
-+	switch (state) {
-+	case USB3_LPM_U1:
-+		feature = USB_DEVICE_U1_ENABLE;
-+		break;
-+	case USB3_LPM_U2:
-+		feature = USB_DEVICE_U2_ENABLE;
-+		break;
-+	default:
-+		dev_warn(&udev->dev, "%s: Can't %s non-U1 or U2 state.\n",
-+				__func__, enable ? "enable" : "disable");
-+		return -EINVAL;
-+	}
-+
-+	if (udev->state != USB_STATE_CONFIGURED) {
-+		dev_dbg(&udev->dev, "%s: Can't %s %s state "
-+				"for unconfigured device.\n",
-+				__func__, enable ? "enable" : "disable",
-+				usb3_lpm_names[state]);
-+		return 0;
-+	}
-+
-+	if (enable) {
-+		/*
-+		 * Now send the control transfer to enable device-initiated LPM
-+		 * for either U1 or U2.
-+		 */
-+		ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+				USB_REQ_SET_FEATURE,
-+				USB_RECIP_DEVICE,
-+				feature,
-+				0, NULL, 0,
-+				USB_CTRL_SET_TIMEOUT);
-+	} else {
-+		ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+				USB_REQ_CLEAR_FEATURE,
-+				USB_RECIP_DEVICE,
-+				feature,
-+				0, NULL, 0,
-+				USB_CTRL_SET_TIMEOUT);
-+	}
-+	if (ret < 0) {
-+		dev_warn(&udev->dev, "%s of device-initiated %s failed.\n",
-+				enable ? "Enable" : "Disable",
-+				usb3_lpm_names[state]);
-+		return -EBUSY;
-+	}
-+	return 0;
-+}
-+
-+static int usb_set_lpm_timeout(struct usb_device *udev,
-+		enum usb3_link_state state, int timeout)
-+{
-+	int ret;
-+	int feature;
-+
-+	switch (state) {
-+	case USB3_LPM_U1:
-+		feature = USB_PORT_FEAT_U1_TIMEOUT;
-+		break;
-+	case USB3_LPM_U2:
-+		feature = USB_PORT_FEAT_U2_TIMEOUT;
-+		break;
-+	default:
-+		dev_warn(&udev->dev, "%s: Can't set timeout for non-U1 or U2 state.\n",
-+				__func__);
-+		return -EINVAL;
-+	}
-+
-+	if (state == USB3_LPM_U1 && timeout > USB3_LPM_U1_MAX_TIMEOUT &&
-+			timeout != USB3_LPM_DEVICE_INITIATED) {
-+		dev_warn(&udev->dev, "Failed to set %s timeout to 0x%x, "
-+				"which is a reserved value.\n",
-+				usb3_lpm_names[state], timeout);
-+		return -EINVAL;
-+	}
-+
-+	ret = set_port_feature(udev->parent,
-+			USB_PORT_LPM_TIMEOUT(timeout) | udev->portnum,
-+			feature);
-+	if (ret < 0) {
-+		dev_warn(&udev->dev, "Failed to set %s timeout to 0x%x,"
-+				"error code %i\n", usb3_lpm_names[state],
-+				timeout, ret);
-+		return -EBUSY;
-+	}
-+	if (state == USB3_LPM_U1)
-+		udev->u1_params.timeout = timeout;
-+	else
-+		udev->u2_params.timeout = timeout;
-+	return 0;
-+}
-+
-+/*
-+ * Enable the hub-initiated U1/U2 idle timeouts, and enable device-initiated
-+ * U1/U2 entry.
-+ *
-+ * We will attempt to enable U1 or U2, but there are no guarantees that the
-+ * control transfers to set the hub timeout or enable device-initiated U1/U2
-+ * will be successful.
-+ *
-+ * If we cannot set the parent hub U1/U2 timeout, we attempt to let the xHCI
-+ * driver know about it.  If that call fails, it should be harmless, and just
-+ * take up more slightly more bus bandwidth for unnecessary U1/U2 exit latency.
-+ */
-+static void usb_enable_link_state(struct usb_hcd *hcd, struct usb_device *udev,
-+		enum usb3_link_state state)
-+{
-+	int timeout, ret;
-+	__u8 u1_mel = udev->bos->ss_cap->bU1devExitLat;
-+	__le16 u2_mel = udev->bos->ss_cap->bU2DevExitLat;
-+
-+	/* If the device says it doesn't have *any* exit latency to come out of
-+	 * U1 or U2, it's probably lying.  Assume it doesn't implement that link
-+	 * state.
-+	 */
-+	if ((state == USB3_LPM_U1 && u1_mel == 0) ||
-+			(state == USB3_LPM_U2 && u2_mel == 0))
-+		return;
-+
-+	/*
-+	 * First, let the device know about the exit latencies
-+	 * associated with the link state we're about to enable.
-+	 */
-+	ret = usb_req_set_sel(udev, state);
-+	if (ret < 0) {
-+		dev_warn(&udev->dev, "Set SEL for device-initiated %s failed.\n",
-+				usb3_lpm_names[state]);
-+		return;
-+	}
-+
-+	/* We allow the host controller to set the U1/U2 timeout internally
-+	 * first, so that it can change its schedule to account for the
-+	 * additional latency to send data to a device in a lower power
-+	 * link state.
-+	 */
-+	timeout = hcd->driver->enable_usb3_lpm_timeout(hcd, udev, state);
-+
-+	/* xHCI host controller doesn't want to enable this LPM state. */
-+	if (timeout == 0)
-+		return;
-+
-+	if (timeout < 0) {
-+		dev_warn(&udev->dev, "Could not enable %s link state, "
-+				"xHCI error %i.\n", usb3_lpm_names[state],
-+				timeout);
-+		return;
-+	}
-+
-+	if (usb_set_lpm_timeout(udev, state, timeout))
-+		/* If we can't set the parent hub U1/U2 timeout,
-+		 * device-initiated LPM won't be allowed either, so let the xHCI
-+		 * host know that this link state won't be enabled.
-+		 */
-+		hcd->driver->disable_usb3_lpm_timeout(hcd, udev, state);
-+
-+	/* Only a configured device will accept the Set Feature U1/U2_ENABLE */
-+	else if (udev->actconfig)
-+		usb_set_device_initiated_lpm(udev, state, true);
-+
-+}
-+
-+/*
-+ * Disable the hub-initiated U1/U2 idle timeouts, and disable device-initiated
-+ * U1/U2 entry.
-+ *
-+ * If this function returns -EBUSY, the parent hub will still allow U1/U2 entry.
-+ * If zero is returned, the parent will not allow the link to go into U1/U2.
-+ *
-+ * If zero is returned, device-initiated U1/U2 entry may still be enabled, but
-+ * it won't have an effect on the bus link state because the parent hub will
-+ * still disallow device-initiated U1/U2 entry.
-+ *
-+ * If zero is returned, the xHCI host controller may still think U1/U2 entry is
-+ * possible.  The result will be slightly more bus bandwidth will be taken up
-+ * (to account for U1/U2 exit latency), but it should be harmless.
-+ */
-+static int usb_disable_link_state(struct usb_hcd *hcd, struct usb_device *udev,
-+		enum usb3_link_state state)
-+{
-+	int feature;
-+
-+	switch (state) {
-+	case USB3_LPM_U1:
-+		feature = USB_PORT_FEAT_U1_TIMEOUT;
-+		break;
-+	case USB3_LPM_U2:
-+		feature = USB_PORT_FEAT_U2_TIMEOUT;
-+		break;
-+	default:
-+		dev_warn(&udev->dev, "%s: Can't disable non-U1 or U2 state.\n",
-+				__func__);
-+		return -EINVAL;
-+	}
-+
-+	if (usb_set_lpm_timeout(udev, state, 0))
-+		return -EBUSY;
-+
-+	usb_set_device_initiated_lpm(udev, state, false);
-+
-+	if (hcd->driver->disable_usb3_lpm_timeout(hcd, udev, state))
-+		dev_warn(&udev->dev, "Could not disable xHCI %s timeout, "
-+				"bus schedule bandwidth may be impacted.\n",
-+				usb3_lpm_names[state]);
-+	return 0;
-+}
-+
-+/*
-+ * Disable hub-initiated and device-initiated U1 and U2 entry.
-+ * Caller must own the bandwidth_mutex.
-+ *
-+ * This will call usb_enable_lpm() on failure, which will decrement
-+ * lpm_disable_count, and will re-enable LPM if lpm_disable_count reaches zero.
-+ */
-+int usb_disable_lpm(struct usb_device *udev)
-+{
-+	struct usb_hcd *hcd;
-+
-+	if (!udev || !udev->parent ||
-+			udev->speed != USB_SPEED_SUPER ||
-+			!udev->lpm_capable)
-+		return 0;
-+
-+	hcd = bus_to_hcd(udev->bus);
-+	if (!hcd || !hcd->driver->disable_usb3_lpm_timeout)
-+		return 0;
-+
-+	udev->lpm_disable_count++;
-+	if ((udev->u1_params.timeout == 0 && udev->u2_params.timeout == 0))
-+		return 0;
-+
-+	/* If LPM is enabled, attempt to disable it. */
-+	if (usb_disable_link_state(hcd, udev, USB3_LPM_U1))
-+		goto enable_lpm;
-+	if (usb_disable_link_state(hcd, udev, USB3_LPM_U2))
-+		goto enable_lpm;
-+
-+	return 0;
-+
-+enable_lpm:
-+	usb_enable_lpm(udev);
-+	return -EBUSY;
-+}
-+EXPORT_SYMBOL_GPL(usb_disable_lpm);
-+
-+/* Grab the bandwidth_mutex before calling usb_disable_lpm() */
-+int usb_unlocked_disable_lpm(struct usb_device *udev)
-+{
-+	struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-+	int ret;
-+
-+	if (!hcd)
-+		return -EINVAL;
-+
-+	mutex_lock(hcd->bandwidth_mutex);
-+	ret = usb_disable_lpm(udev);
-+	mutex_unlock(hcd->bandwidth_mutex);
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(usb_unlocked_disable_lpm);
-+
-+/*
-+ * Attempt to enable device-initiated and hub-initiated U1 and U2 entry.  The
-+ * xHCI host policy may prevent U1 or U2 from being enabled.
-+ *
-+ * Other callers may have disabled link PM, so U1 and U2 entry will be disabled
-+ * until the lpm_disable_count drops to zero.  Caller must own the
-+ * bandwidth_mutex.
-+ */
-+void usb_enable_lpm(struct usb_device *udev)
-+{
-+	struct usb_hcd *hcd;
-+
-+	if (!udev || !udev->parent ||
-+			udev->speed != USB_SPEED_SUPER ||
-+			!udev->lpm_capable)
-+		return;
-+
-+	udev->lpm_disable_count--;
-+	hcd = bus_to_hcd(udev->bus);
-+	/* Double check that we can both enable and disable LPM.
-+	 * Device must be configured to accept set feature U1/U2 timeout.
-+	 */
-+	if (!hcd || !hcd->driver->enable_usb3_lpm_timeout ||
-+			!hcd->driver->disable_usb3_lpm_timeout)
-+		return;
-+
-+	if (udev->lpm_disable_count > 0)
-+		return;
-+
-+	usb_enable_link_state(hcd, udev, USB3_LPM_U1);
-+	usb_enable_link_state(hcd, udev, USB3_LPM_U2);
-+}
-+EXPORT_SYMBOL_GPL(usb_enable_lpm);
-+
-+/* Grab the bandwidth_mutex before calling usb_enable_lpm() */
-+void usb_unlocked_enable_lpm(struct usb_device *udev)
-+{
-+	struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-+
-+	if (!hcd)
-+		return;
-+
-+	mutex_lock(hcd->bandwidth_mutex);
-+	usb_enable_lpm(udev);
-+	mutex_unlock(hcd->bandwidth_mutex);
-+}
-+EXPORT_SYMBOL_GPL(usb_unlocked_enable_lpm);
-+
-+
-+#else	/* CONFIG_PM */
-+
-+#define hub_suspend		NULL
-+#define hub_resume		NULL
-+#define hub_reset_resume	NULL
-+
-+int usb_disable_lpm(struct usb_device *udev)
-+{
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(usb_disable_lpm);
-+
-+void usb_enable_lpm(struct usb_device *udev) { }
-+EXPORT_SYMBOL_GPL(usb_enable_lpm);
-+
-+int usb_unlocked_disable_lpm(struct usb_device *udev)
-+{
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(usb_unlocked_disable_lpm);
-+
-+void usb_unlocked_enable_lpm(struct usb_device *udev) { }
-+EXPORT_SYMBOL_GPL(usb_unlocked_enable_lpm);
-+
-+int usb_disable_ltm(struct usb_device *udev)
-+{
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(usb_disable_ltm);
-+
-+void usb_enable_ltm(struct usb_device *udev) { }
-+EXPORT_SYMBOL_GPL(usb_enable_ltm);
-+#endif
-+
-+
-+/* USB 2.0 spec, 7.1.7.3 / fig 7-29:
-+ *
-+ * Between connect detection and reset signaling there must be a delay
-+ * of 100ms at least for debounce and power-settling.  The corresponding
-+ * timer shall restart whenever the downstream port detects a disconnect.
-+ * 
-+ * Apparently there are some bluetooth and irda-dongles and a number of
-+ * low-speed devices for which this debounce period may last over a second.
-+ * Not covered by the spec - but easy to deal with.
-+ *
-+ * This implementation uses a 1500ms total debounce timeout; if the
-+ * connection isn't stable by then it returns -ETIMEDOUT.  It checks
-+ * every 25ms for transient disconnects.  When the port status has been
-+ * unchanged for 100ms it returns the port status.
-+ */
-+static int hub_port_debounce(struct usb_hub *hub, int port1)
-+{
-+	int ret;
-+	int total_time, stable_time = 0;
-+	u16 portchange, portstatus;
-+	unsigned connection = 0xffff;
-+
-+	for (total_time = 0; ; total_time += HUB_DEBOUNCE_STEP) {
-+		ret = hub_port_status(hub, port1, &portstatus, &portchange);
-+		if (ret < 0)
-+			return ret;
-+
-+		if (!(portchange & USB_PORT_STAT_C_CONNECTION) &&
-+		     (portstatus & USB_PORT_STAT_CONNECTION) == connection) {
-+			stable_time += HUB_DEBOUNCE_STEP;
-+			if (stable_time >= HUB_DEBOUNCE_STABLE)
-+				break;
-+		} else {
-+			stable_time = 0;
-+			connection = portstatus & USB_PORT_STAT_CONNECTION;
-+		}
-+
-+		if (portchange & USB_PORT_STAT_C_CONNECTION) {
-+			clear_port_feature(hub->hdev, port1,
-+					USB_PORT_FEAT_C_CONNECTION);
-+		}
-+
-+		if (total_time >= HUB_DEBOUNCE_TIMEOUT)
-+			break;
-+		msleep(HUB_DEBOUNCE_STEP);
-+	}
-+
-+	dev_dbg (hub->intfdev,
-+		"debounce: port %d: total %dms stable %dms status 0x%x\n",
-+		port1, total_time, stable_time, portstatus);
-+
-+	if (stable_time < HUB_DEBOUNCE_STABLE)
-+		return -ETIMEDOUT;
-+	return portstatus;
-+}
-+
-+void usb_ep0_reinit(struct usb_device *udev)
-+{
-+	usb_disable_endpoint(udev, 0 + USB_DIR_IN, true);
-+	usb_disable_endpoint(udev, 0 + USB_DIR_OUT, true);
-+	usb_enable_endpoint(udev, &udev->ep0, true);
-+}
-+EXPORT_SYMBOL_GPL(usb_ep0_reinit);
-+
-+#define usb_sndaddr0pipe()	(PIPE_CONTROL << 30)
-+#define usb_rcvaddr0pipe()	((PIPE_CONTROL << 30) | USB_DIR_IN)
-+
-+static int hub_set_address(struct usb_device *udev, int devnum)
-+{
-+	int retval;
-+	struct usb_hcd *hcd = bus_to_hcd(udev->bus);
-+
-+	/*
-+	 * The host controller will choose the device address,
-+	 * instead of the core having chosen it earlier
-+	 */
-+	if (!hcd->driver->address_device && devnum <= 1)
-+		return -EINVAL;
-+	if (udev->state == USB_STATE_ADDRESS)
-+		return 0;
-+	if (udev->state != USB_STATE_DEFAULT)
-+		return -EINVAL;
-+	if (hcd->driver->address_device)
-+		retval = hcd->driver->address_device(hcd, udev);
-+	else
-+		retval = usb_control_msg(udev, usb_sndaddr0pipe(),
-+				USB_REQ_SET_ADDRESS, 0, devnum, 0,
-+				NULL, 0, USB_CTRL_SET_TIMEOUT);
-+	if (retval == 0) {
-+		update_devnum(udev, devnum);
-+		/* Device now using proper address. */
-+		usb_set_device_state(udev, USB_STATE_ADDRESS);
-+		usb_ep0_reinit(udev);
-+	}
-+	return retval;
-+}
-+
-+/* Reset device, (re)assign address, get device descriptor.
-+ * Device connection must be stable, no more debouncing needed.
-+ * Returns device in USB_STATE_ADDRESS, except on error.
-+ *
-+ * If this is called for an already-existing device (as part of
-+ * usb_reset_and_verify_device), the caller must own the device lock.  For a
-+ * newly detected device that is not accessible through any global
-+ * pointers, it's not necessary to lock the device.
-+ */
-+static int
-+hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
-+		int retry_counter)
-+{
-+	static DEFINE_MUTEX(usb_address0_mutex);
-+
-+	struct usb_device	*hdev = hub->hdev;
-+	struct usb_hcd		*hcd = bus_to_hcd(hdev->bus);
-+	int			i, j, retval;
-+	unsigned		delay = HUB_SHORT_RESET_TIME;
-+	enum usb_device_speed	oldspeed = udev->speed;
-+	const char		*speed;
-+	int			devnum = udev->devnum;
-+
-+	/* root hub ports have a slightly longer reset period
-+	 * (from USB 2.0 spec, section 7.1.7.5)
-+	 */
-+	if (!hdev->parent) {
-+		delay = HUB_ROOT_RESET_TIME;
-+		if (port1 == hdev->bus->otg_port)
-+			hdev->bus->b_hnp_enable = 0;
-+	}
-+
-+	/* Some low speed devices have problems with the quick delay, so */
-+	/*  be a bit pessimistic with those devices. RHbug #23670 */
-+	if (oldspeed == USB_SPEED_LOW)
-+		delay = HUB_LONG_RESET_TIME;
-+
-+	mutex_lock(&usb_address0_mutex);
-+
-+	/* Reset the device; full speed may morph to high speed */
-+	/* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */
-+	retval = hub_port_reset(hub, port1, udev, delay, false);
-+	if (retval < 0)		/* error or disconnect */
-+		goto fail;
-+	/* success, speed is known */
-+
-+	retval = -ENODEV;
-+
-+	if (oldspeed != USB_SPEED_UNKNOWN && oldspeed != udev->speed) {
-+		dev_dbg(&udev->dev, "device reset changed speed!\n");
-+		goto fail;
-+	}
-+	oldspeed = udev->speed;
-+
-+	/* USB 2.0 section 5.5.3 talks about ep0 maxpacket ...
-+	 * it's fixed size except for full speed devices.
-+	 * For Wireless USB devices, ep0 max packet is always 512 (tho
-+	 * reported as 0xff in the device descriptor). WUSB1.0[4.8.1].
-+	 */
-+	switch (udev->speed) {
-+	case USB_SPEED_SUPER:
-+	case USB_SPEED_WIRELESS:	/* fixed at 512 */
-+		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(512);
-+		break;
-+	case USB_SPEED_HIGH:		/* fixed at 64 */
-+		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64);
-+		break;
-+	case USB_SPEED_FULL:		/* 8, 16, 32, or 64 */
-+		/* to determine the ep0 maxpacket size, try to read
-+		 * the device descriptor to get bMaxPacketSize0 and
-+		 * then correct our initial guess.
-+		 */
-+		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(64);
-+		break;
-+	case USB_SPEED_LOW:		/* fixed at 8 */
-+		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(8);
-+		break;
-+	default:
-+		goto fail;
-+	}
-+
-+	if (udev->speed == USB_SPEED_WIRELESS)
-+		speed = "variable speed Wireless";
-+	else
-+		speed = usb_speed_string(udev->speed);
-+
-+	if (udev->speed != USB_SPEED_SUPER)
-+		dev_info(&udev->dev,
-+				"%s %s USB device number %d using %s\n",
-+				(udev->config) ? "reset" : "new", speed,
-+				devnum, udev->bus->controller->driver->name);
-+
-+	/* Set up TT records, if needed  */
-+	if (hdev->tt) {
-+		udev->tt = hdev->tt;
-+		udev->ttport = hdev->ttport;
-+	} else if (udev->speed != USB_SPEED_HIGH
-+			&& hdev->speed == USB_SPEED_HIGH) {
-+		if (!hub->tt.hub) {
-+			dev_err(&udev->dev, "parent hub has no TT\n");
-+			retval = -EINVAL;
-+			goto fail;
-+		}
-+		udev->tt = &hub->tt;
-+		udev->ttport = port1;
-+	}
-+ 
-+	/* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way?
-+	 * Because device hardware and firmware is sometimes buggy in
-+	 * this area, and this is how Linux has done it for ages.
-+	 * Change it cautiously.
-+	 *
-+	 * NOTE:  If USE_NEW_SCHEME() is true we will start by issuing
-+	 * a 64-byte GET_DESCRIPTOR request.  This is what Windows does,
-+	 * so it may help with some non-standards-compliant devices.
-+	 * Otherwise we start with SET_ADDRESS and then try to read the
-+	 * first 8 bytes of the device descriptor to get the ep0 maxpacket
-+	 * value.
-+	 */
-+	for (i = 0; i < GET_DESCRIPTOR_TRIES; (++i, msleep(100))) {
-+		if (USE_NEW_SCHEME(retry_counter) && !(hcd->driver->flags & HCD_USB3)) {
-+			struct usb_device_descriptor *buf;
-+			int r = 0;
-+
-+#define GET_DESCRIPTOR_BUFSIZE	64
-+			buf = kmalloc(GET_DESCRIPTOR_BUFSIZE, GFP_NOIO);
-+			if (!buf) {
-+				retval = -ENOMEM;
-+				continue;
-+			}
-+
-+			/* Retry on all errors; some devices are flakey.
-+			 * 255 is for WUSB devices, we actually need to use
-+			 * 512 (WUSB1.0[4.8.1]).
-+			 */
-+			for (j = 0; j < 3; ++j) {
-+				buf->bMaxPacketSize0 = 0;
-+				r = usb_control_msg(udev, usb_rcvaddr0pipe(),
-+					USB_REQ_GET_DESCRIPTOR, USB_DIR_IN,
-+					USB_DT_DEVICE << 8, 0,
-+					buf, GET_DESCRIPTOR_BUFSIZE,
-+					initial_descriptor_timeout);
-+				switch (buf->bMaxPacketSize0) {
-+				case 8: case 16: case 32: case 64: case 255:
-+					if (buf->bDescriptorType ==
-+							USB_DT_DEVICE) {
-+						r = 0;
-+						break;
-+					}
-+					/* FALL THROUGH */
-+				default:
-+					if (r == 0)
-+						r = -EPROTO;
-+					break;
-+				}
-+				if (r == 0)
-+					break;
-+			}
-+			udev->descriptor.bMaxPacketSize0 =
-+					buf->bMaxPacketSize0;
-+			kfree(buf);
-+
-+			retval = hub_port_reset(hub, port1, udev, delay, false);
-+			if (retval < 0)		/* error or disconnect */
-+				goto fail;
-+			if (oldspeed != udev->speed) {
-+				dev_dbg(&udev->dev,
-+					"device reset changed speed!\n");
-+				retval = -ENODEV;
-+				goto fail;
-+			}
-+			if (r) {
-+				dev_err(&udev->dev,
-+					"device descriptor read/64, error %d\n",
-+					r);
-+				retval = -EMSGSIZE;
-+				continue;
-+			}
-+#undef GET_DESCRIPTOR_BUFSIZE
-+		}
-+
-+ 		/*
-+ 		 * If device is WUSB, we already assigned an
-+ 		 * unauthorized address in the Connect Ack sequence;
-+ 		 * authorization will assign the final address.
-+ 		 */
-+		if (udev->wusb == 0) {
-+			for (j = 0; j < SET_ADDRESS_TRIES; ++j) {
-+				retval = hub_set_address(udev, devnum);
-+				if (retval >= 0)
-+					break;
-+				msleep(200);
-+			}
-+			if (retval < 0) {
-+				dev_err(&udev->dev,
-+					"device not accepting address %d, error %d\n",
-+					devnum, retval);
-+				goto fail;
-+			}
-+			if (udev->speed == USB_SPEED_SUPER) {
-+				devnum = udev->devnum;
-+				dev_info(&udev->dev,
-+						"%s SuperSpeed USB device number %d using %s\n",
-+						(udev->config) ? "reset" : "new",
-+						devnum, udev->bus->controller->driver->name);
-+			}
-+
-+			/* cope with hardware quirkiness:
-+			 *  - let SET_ADDRESS settle, some device hardware wants it
-+			 *  - read ep0 maxpacket even for high and low speed,
-+			 */
-+			msleep(10);
-+			if (USE_NEW_SCHEME(retry_counter) && !(hcd->driver->flags & HCD_USB3))
-+				break;
-+  		}
-+
-+		retval = usb_get_device_descriptor(udev, 8);
-+		if (retval < 8) {
-+			dev_err(&udev->dev,
-+					"device descriptor read/8, error %d\n",
-+					retval);
-+			if (retval >= 0)
-+				retval = -EMSGSIZE;
-+		} else {
-+			retval = 0;
-+			break;
-+		}
-+	}
-+	if (retval)
-+		goto fail;
-+
-+	/*
-+	 * Some superspeed devices have finished the link training process
-+	 * and attached to a superspeed hub port, but the device descriptor
-+	 * got from those devices show they aren't superspeed devices. Warm
-+	 * reset the port attached by the devices can fix them.
-+	 */
-+	if ((udev->speed == USB_SPEED_SUPER) &&
-+			(le16_to_cpu(udev->descriptor.bcdUSB) < 0x0300)) {
-+		dev_err(&udev->dev, "got a wrong device descriptor, "
-+				"warm reset device\n");
-+		hub_port_reset(hub, port1, udev,
-+				HUB_BH_RESET_TIME, true);
-+		retval = -EINVAL;
-+		goto fail;
-+	}
-+
-+	if (udev->descriptor.bMaxPacketSize0 == 0xff ||
-+			udev->speed == USB_SPEED_SUPER)
-+		i = 512;
-+	else
-+		i = udev->descriptor.bMaxPacketSize0;
-+	if (usb_endpoint_maxp(&udev->ep0.desc) != i) {
-+		if (udev->speed == USB_SPEED_LOW ||
-+				!(i == 8 || i == 16 || i == 32 || i == 64)) {
-+			dev_err(&udev->dev, "Invalid ep0 maxpacket: %d\n", i);
-+			retval = -EMSGSIZE;
-+			goto fail;
-+		}
-+		if (udev->speed == USB_SPEED_FULL)
-+			dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i);
-+		else
-+			dev_warn(&udev->dev, "Using ep0 maxpacket: %d\n", i);
-+		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i);
-+		usb_ep0_reinit(udev);
-+	}
-+  
-+	retval = usb_get_device_descriptor(udev, USB_DT_DEVICE_SIZE);
-+	if (retval < (signed)sizeof(udev->descriptor)) {
-+		dev_err(&udev->dev, "device descriptor read/all, error %d\n",
-+			retval);
-+		if (retval >= 0)
-+			retval = -ENOMSG;
-+		goto fail;
-+	}
-+
-+	if (udev->wusb == 0 && le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0201) {
-+		retval = usb_get_bos_descriptor(udev);
-+		if (!retval) {
-+			udev->lpm_capable = usb_device_supports_lpm(udev);
-+			usb_set_lpm_parameters(udev);
-+		}
-+	}
-+
-+	retval = 0;
-+	/* notify HCD that we have a device connected and addressed */
-+	if (hcd->driver->update_device)
-+		hcd->driver->update_device(hcd, udev);
-+fail:
-+	if (retval) {
-+		hub_port_disable(hub, port1, 0);
-+		update_devnum(udev, devnum);	/* for disconnect processing */
-+	}
-+	mutex_unlock(&usb_address0_mutex);
-+	return retval;
-+}
-+
-+static void
-+check_highspeed (struct usb_hub *hub, struct usb_device *udev, int port1)
-+{
-+	struct usb_qualifier_descriptor	*qual;
-+	int				status;
-+
-+	qual = kmalloc (sizeof *qual, GFP_KERNEL);
-+	if (qual == NULL)
-+		return;
-+
-+	status = usb_get_descriptor (udev, USB_DT_DEVICE_QUALIFIER, 0,
-+			qual, sizeof *qual);
-+	if (status == sizeof *qual) {
-+		dev_info(&udev->dev, "not running at top speed; "
-+			"connect to a high speed hub\n");
-+		/* hub LEDs are probably harder to miss than syslog */
-+		if (hub->has_indicators) {
-+			hub->indicator[port1-1] = INDICATOR_GREEN_BLINK;
-+			schedule_delayed_work (&hub->leds, 0);
-+		}
-+	}
-+	kfree(qual);
-+}
-+
-+static unsigned
-+hub_power_remaining (struct usb_hub *hub)
-+{
-+	struct usb_device *hdev = hub->hdev;
-+	int remaining;
-+	int port1;
-+
-+	if (!hub->limited_power)
-+		return 0;
-+
-+	remaining = hdev->bus_mA - hub->descriptor->bHubContrCurrent;
-+	for (port1 = 1; port1 <= hdev->maxchild; ++port1) {
-+		struct usb_device	*udev = hdev->children[port1 - 1];
-+		int			delta;
-+
-+		if (!udev)
-+			continue;
-+
-+		/* Unconfigured devices may not use more than 100mA,
-+		 * or 8mA for OTG ports */
-+		if (udev->actconfig)
-+			delta = udev->actconfig->desc.bMaxPower * 2;
-+		else if (port1 != udev->bus->otg_port || hdev->parent)
-+			delta = 100;
-+		else
-+			delta = 8;
-+		if (delta > hub->mA_per_port)
-+			dev_warn(&udev->dev,
-+				 "%dmA is over %umA budget for port %d!\n",
-+				 delta, hub->mA_per_port, port1);
-+		remaining -= delta;
-+	}
-+	if (remaining < 0) {
-+		dev_warn(hub->intfdev, "%dmA over power budget!\n",
-+			- remaining);
-+		remaining = 0;
-+	}
-+	return remaining;
-+}
-+
-+/* Handle physical or logical connection change events.
-+ * This routine is called when:
-+ * 	a port connection-change occurs;
-+ *	a port enable-change occurs (often caused by EMI);
-+ *	usb_reset_and_verify_device() encounters changed descriptors (as from
-+ *		a firmware download)
-+ * caller already locked the hub
-+ */
-+static void hub_port_connect_change(struct usb_hub *hub, int port1,
-+					u16 portstatus, u16 portchange)
-+{
-+	struct usb_device *hdev = hub->hdev;
-+	struct device *hub_dev = hub->intfdev;
-+	struct usb_hcd *hcd = bus_to_hcd(hdev->bus);
-+	unsigned wHubCharacteristics =
-+			le16_to_cpu(hub->descriptor->wHubCharacteristics);
-+	struct usb_device *udev;
-+	int status, i;
-+
-+	dev_dbg (hub_dev,
-+		"port %d, status %04x, change %04x, %s\n",
-+		port1, portstatus, portchange, portspeed(hub, portstatus));
-+
-+	if (hub->has_indicators) {
-+		set_port_led(hub, port1, HUB_LED_AUTO);
-+		hub->indicator[port1-1] = INDICATOR_AUTO;
-+	}
-+
-+#ifdef	CONFIG_USB_OTG
-+	/* during HNP, don't repeat the debounce */
-+	if (hdev->bus->is_b_host)
-+		portchange &= ~(USB_PORT_STAT_C_CONNECTION |
-+				USB_PORT_STAT_C_ENABLE);
-+#endif
-+
-+	/* Try to resuscitate an existing device */
-+	udev = hdev->children[port1-1];
-+	if ((portstatus & USB_PORT_STAT_CONNECTION) && udev &&
-+			udev->state != USB_STATE_NOTATTACHED) {
-+		usb_lock_device(udev);
-+		if (portstatus & USB_PORT_STAT_ENABLE) {
-+			status = 0;		/* Nothing to do */
-+
-+#ifdef CONFIG_USB_SUSPEND
-+		} else if (udev->state == USB_STATE_SUSPENDED &&
-+				udev->persist_enabled) {
-+			/* For a suspended device, treat this as a
-+			 * remote wakeup event.
-+			 */
-+			status = usb_remote_wakeup(udev);
-+#endif
-+
-+		} else {
-+			status = -ENODEV;	/* Don't resuscitate */
-+		}
-+		usb_unlock_device(udev);
-+
-+		if (status == 0) {
-+			clear_bit(port1, hub->change_bits);
-+			return;
-+		}
-+	}
-+
-+	/* Disconnect any existing devices under this port */
-+	if (udev)
-+		usb_disconnect(&hdev->children[port1-1]);
-+	clear_bit(port1, hub->change_bits);
-+
-+	/* We can forget about a "removed" device when there's a physical
-+	 * disconnect or the connect status changes.
-+	 */
-+	if (!(portstatus & USB_PORT_STAT_CONNECTION) ||
-+			(portchange & USB_PORT_STAT_C_CONNECTION))
-+		clear_bit(port1, hub->removed_bits);
-+
-+	if (portchange & (USB_PORT_STAT_C_CONNECTION |
-+				USB_PORT_STAT_C_ENABLE)) {
-+		status = hub_port_debounce(hub, port1);
-+		if (status < 0) {
-+			if (printk_ratelimit())
-+				dev_err(hub_dev, "connect-debounce failed, "
-+						"port %d disabled\n", port1);
-+			portstatus &= ~USB_PORT_STAT_CONNECTION;
-+		} else {
-+			portstatus = status;
-+		}
-+	}
-+
-+	if (hcd->phy && !hdev->parent) {
-+		if (portstatus & USB_PORT_STAT_CONNECTION)
-+			usb_phy_notify_connect(hcd->phy, port1);
-+		else
-+			usb_phy_notify_disconnect(hcd->phy, port1);
-+	}
-+
-+	/* Return now if debouncing failed or nothing is connected or
-+	 * the device was "removed".
-+	 */
-+	if (!(portstatus & USB_PORT_STAT_CONNECTION) ||
-+			test_bit(port1, hub->removed_bits)) {
-+
-+		/* maybe switch power back on (e.g. root hub was reset) */
-+		if ((wHubCharacteristics & HUB_CHAR_LPSM) < 2
-+				&& !port_is_power_on(hub, portstatus))
-+			set_port_feature(hdev, port1, USB_PORT_FEAT_POWER);
-+
-+		if (portstatus & USB_PORT_STAT_ENABLE)
-+  			goto done;
-+		return;
-+	}
-+
-+	for (i = 0; i < SET_CONFIG_TRIES; i++) {
-+
-+		/* reallocate for each attempt, since references
-+		 * to the previous one can escape in various ways
-+		 */
-+		udev = usb_alloc_dev(hdev, hdev->bus, port1);
-+		if (!udev) {
-+			dev_err (hub_dev,
-+				"couldn't allocate port %d usb_device\n",
-+				port1);
-+			goto done;
-+		}
-+
-+		usb_set_device_state(udev, USB_STATE_POWERED);
-+ 		udev->bus_mA = hub->mA_per_port;
-+		udev->level = hdev->level + 1;
-+		udev->wusb = hub_is_wusb(hub);
-+
-+		/* Only USB 3.0 devices are connected to SuperSpeed hubs. */
-+		if (hub_is_superspeed(hub->hdev))
-+			udev->speed = USB_SPEED_SUPER;
-+		else
-+			udev->speed = USB_SPEED_UNKNOWN;
-+
-+		choose_devnum(udev);
-+		if (udev->devnum <= 0) {
-+			status = -ENOTCONN;	/* Don't retry */
-+			goto loop;
-+		}
-+
-+		/* reset (non-USB 3.0 devices) and get descriptor */
-+		status = hub_port_init(hub, udev, port1, i);
-+		if (status < 0)
-+			goto loop;
-+
-+		usb_detect_quirks(udev);
-+		if (udev->quirks & USB_QUIRK_DELAY_INIT)
-+			msleep(1000);
-+
-+		/* consecutive bus-powered hubs aren't reliable; they can
-+		 * violate the voltage drop budget.  if the new child has
-+		 * a "powered" LED, users should notice we didn't enable it
-+		 * (without reading syslog), even without per-port LEDs
-+		 * on the parent.
-+		 */
-+		if (udev->descriptor.bDeviceClass == USB_CLASS_HUB
-+				&& udev->bus_mA <= 100) {
-+			u16	devstat;
-+
-+			status = usb_get_status(udev, USB_RECIP_DEVICE, 0,
-+					&devstat);
-+			if (status < 2) {
-+				dev_dbg(&udev->dev, "get status %d ?\n", status);
-+				goto loop_disable;
-+			}
-+			le16_to_cpus(&devstat);
-+			if ((devstat & (1 << USB_DEVICE_SELF_POWERED)) == 0) {
-+				dev_err(&udev->dev,
-+					"can't connect bus-powered hub "
-+					"to this port\n");
-+				if (hub->has_indicators) {
-+					hub->indicator[port1-1] =
-+						INDICATOR_AMBER_BLINK;
-+					schedule_delayed_work (&hub->leds, 0);
-+				}
-+				status = -ENOTCONN;	/* Don't retry */
-+				goto loop_disable;
-+			}
-+		}
-+ 
-+		/* check for devices running slower than they could */
-+		if (le16_to_cpu(udev->descriptor.bcdUSB) >= 0x0200
-+				&& udev->speed == USB_SPEED_FULL
-+				&& highspeed_hubs != 0)
-+			check_highspeed (hub, udev, port1);
-+
-+		/* Store the parent's children[] pointer.  At this point
-+		 * udev becomes globally accessible, although presumably
-+		 * no one will look at it until hdev is unlocked.
-+		 */
-+		status = 0;
-+
-+		/* We mustn't add new devices if the parent hub has
-+		 * been disconnected; we would race with the
-+		 * recursively_mark_NOTATTACHED() routine.
-+		 */
-+		spin_lock_irq(&device_state_lock);
-+		if (hdev->state == USB_STATE_NOTATTACHED)
-+			status = -ENOTCONN;
-+		else
-+			hdev->children[port1-1] = udev;
-+		spin_unlock_irq(&device_state_lock);
-+
-+		/* Run it through the hoops (find a driver, etc) */
-+		if (!status) {
-+			status = usb_new_device(udev);
-+			if (status) {
-+				spin_lock_irq(&device_state_lock);
-+				hdev->children[port1-1] = NULL;
-+				spin_unlock_irq(&device_state_lock);
-+			}
-+		}
-+
-+		if (status)
-+			goto loop_disable;
-+
-+		status = hub_power_remaining(hub);
-+		if (status)
-+			dev_dbg(hub_dev, "%dmA power budget left\n", status);
-+
-+		return;
-+
-+loop_disable:
-+		hub_port_disable(hub, port1, 1);
-+loop:
-+		usb_ep0_reinit(udev);
-+		release_devnum(udev);
-+		hub_free_dev(udev);
-+		usb_put_dev(udev);
-+		if ((status == -ENOTCONN) || (status == -ENOTSUPP))
-+			break;
-+	}
-+	if (hub->hdev->parent ||
-+			!hcd->driver->port_handed_over ||
-+			!(hcd->driver->port_handed_over)(hcd, port1))
-+		dev_err(hub_dev, "unable to enumerate USB device on port %d\n",
-+				port1);
-+ 
-+done:
-+	hub_port_disable(hub, port1, 1);
-+	if (hcd->driver->relinquish_port && !hub->hdev->parent)
-+		hcd->driver->relinquish_port(hcd, port1);
-+}
-+
-+/* Returns 1 if there was a remote wakeup and a connect status change. */
-+static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
-+		u16 portstatus, u16 portchange)
-+{
-+	struct usb_device *hdev;
-+	struct usb_device *udev;
-+	int connect_change = 0;
-+	int ret;
-+
-+	hdev = hub->hdev;
-+	udev = hdev->children[port-1];
-+	if (!hub_is_superspeed(hdev)) {
-+		if (!(portchange & USB_PORT_STAT_C_SUSPEND))
-+			return 0;
-+		clear_port_feature(hdev, port, USB_PORT_FEAT_C_SUSPEND);
-+	} else {
-+		if (!udev || udev->state != USB_STATE_SUSPENDED ||
-+				 (portstatus & USB_PORT_STAT_LINK_STATE) !=
-+				 USB_SS_PORT_LS_U0)
-+			return 0;
-+	}
-+
-+	if (udev) {
-+		/* TRSMRCY = 10 msec */
-+		msleep(10);
-+
-+		usb_lock_device(udev);
-+		ret = usb_remote_wakeup(udev);
-+		usb_unlock_device(udev);
-+		if (ret < 0)
-+			connect_change = 1;
-+	} else {
-+		ret = -ENODEV;
-+		hub_port_disable(hub, port, 1);
-+	}
-+	dev_dbg(hub->intfdev, "resume on port %d, status %d\n",
-+			port, ret);
-+	return connect_change;
-+}
-+
-+static void hub_events(void)
-+{
-+	struct list_head *tmp;
-+	struct usb_device *hdev;
-+	struct usb_interface *intf;
-+	struct usb_hub *hub;
-+	struct device *hub_dev;
-+	u16 hubstatus;
-+	u16 hubchange;
-+	u16 portstatus;
-+	u16 portchange;
-+	int i, ret;
-+	int connect_change, wakeup_change;
-+
-+	/*
-+	 *  We restart the list every time to avoid a deadlock with
-+	 * deleting hubs downstream from this one. This should be
-+	 * safe since we delete the hub from the event list.
-+	 * Not the most efficient, but avoids deadlocks.
-+	 */
-+	while (1) {
-+
-+		/* Grab the first entry at the beginning of the list */
-+		spin_lock_irq(&hub_event_lock);
-+		if (list_empty(&hub_event_list)) {
-+			spin_unlock_irq(&hub_event_lock);
-+			break;
-+		}
-+
-+		tmp = hub_event_list.next;
-+		list_del_init(tmp);
-+
-+		hub = list_entry(tmp, struct usb_hub, event_list);
-+		kref_get(&hub->kref);
-+		spin_unlock_irq(&hub_event_lock);
-+
-+		hdev = hub->hdev;
-+		hub_dev = hub->intfdev;
-+		intf = to_usb_interface(hub_dev);
-+		dev_dbg(hub_dev, "state %d ports %d chg %04x evt %04x\n",
-+				hdev->state, hub->descriptor
-+					? hub->descriptor->bNbrPorts
-+					: 0,
-+				/* NOTE: expects max 15 ports... */
-+				(u16) hub->change_bits[0],
-+				(u16) hub->event_bits[0]);
-+
-+		/* Lock the device, then check to see if we were
-+		 * disconnected while waiting for the lock to succeed. */
-+		usb_lock_device(hdev);
-+		if (unlikely(hub->disconnected))
-+			goto loop_disconnected;
-+
-+		/* If the hub has died, clean up after it */
-+		if (hdev->state == USB_STATE_NOTATTACHED) {
-+			hub->error = -ENODEV;
-+			hub_quiesce(hub, HUB_DISCONNECT);
-+			goto loop;
-+		}
-+
-+		/* Autoresume */
-+		ret = usb_autopm_get_interface(intf);
-+		if (ret) {
-+			dev_dbg(hub_dev, "Can't autoresume: %d\n", ret);
-+			goto loop;
-+		}
-+
-+		/* If this is an inactive hub, do nothing */
-+		if (hub->quiescing)
-+			goto loop_autopm;
-+
-+		if (hub->error) {
-+			dev_dbg (hub_dev, "resetting for error %d\n",
-+				hub->error);
-+
-+			ret = usb_reset_device(hdev);
-+			if (ret) {
-+				dev_dbg (hub_dev,
-+					"error resetting hub: %d\n", ret);
-+				goto loop_autopm;
-+			}
-+
-+			hub->nerrors = 0;
-+			hub->error = 0;
-+		}
-+
-+		/* deal with port status changes */
-+		for (i = 1; i <= hub->descriptor->bNbrPorts; i++) {
-+			if (test_bit(i, hub->busy_bits))
-+				continue;
-+			connect_change = test_bit(i, hub->change_bits);
-+			wakeup_change = test_and_clear_bit(i, hub->wakeup_bits);
-+			if (!test_and_clear_bit(i, hub->event_bits) &&
-+					!connect_change && !wakeup_change)
-+				continue;
-+
-+			ret = hub_port_status(hub, i,
-+					&portstatus, &portchange);
-+			if (ret < 0)
-+				continue;
-+
-+			if (portchange & USB_PORT_STAT_C_CONNECTION) {
-+				clear_port_feature(hdev, i,
-+					USB_PORT_FEAT_C_CONNECTION);
-+				connect_change = 1;
-+			}
-+
-+			if (portchange & USB_PORT_STAT_C_ENABLE) {
-+				if (!connect_change)
-+					dev_dbg (hub_dev,
-+						"port %d enable change, "
-+						"status %08x\n",
-+						i, portstatus);
-+				clear_port_feature(hdev, i,
-+					USB_PORT_FEAT_C_ENABLE);
-+
-+				/*
-+				 * EM interference sometimes causes badly
-+				 * shielded USB devices to be shutdown by
-+				 * the hub, this hack enables them again.
-+				 * Works at least with mouse driver. 
-+				 */
-+				if (!(portstatus & USB_PORT_STAT_ENABLE)
-+				    && !connect_change
-+				    && hdev->children[i-1]) {
-+					dev_err (hub_dev,
-+					    "port %i "
-+					    "disabled by hub (EMI?), "
-+					    "re-enabling...\n",
-+						i);
-+					connect_change = 1;
-+				}
-+			}
-+
-+			if (hub_handle_remote_wakeup(hub, i,
-+						portstatus, portchange))
-+				connect_change = 1;
-+
-+			if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
-+				u16 status = 0;
-+				u16 unused;
-+
-+				dev_dbg(hub_dev, "over-current change on port "
-+					"%d\n", i);
-+				clear_port_feature(hdev, i,
-+					USB_PORT_FEAT_C_OVER_CURRENT);
-+				msleep(100);	/* Cool down */
-+				hub_power_on(hub, true);
-+				hub_port_status(hub, i, &status, &unused);
-+				if (status & USB_PORT_STAT_OVERCURRENT)
-+					dev_err(hub_dev, "over-current "
-+						"condition on port %d\n", i);
-+			}
-+
-+			if (portchange & USB_PORT_STAT_C_RESET) {
-+				dev_dbg (hub_dev,
-+					"reset change on port %d\n",
-+					i);
-+				clear_port_feature(hdev, i,
-+					USB_PORT_FEAT_C_RESET);
-+			}
-+			if ((portchange & USB_PORT_STAT_C_BH_RESET) &&
-+					hub_is_superspeed(hub->hdev)) {
-+				dev_dbg(hub_dev,
-+					"warm reset change on port %d\n",
-+					i);
-+				clear_port_feature(hdev, i,
-+					USB_PORT_FEAT_C_BH_PORT_RESET);
-+			}
-+			if (portchange & USB_PORT_STAT_C_LINK_STATE) {
-+				clear_port_feature(hub->hdev, i,
-+						USB_PORT_FEAT_C_PORT_LINK_STATE);
-+			}
-+			if (portchange & USB_PORT_STAT_C_CONFIG_ERROR) {
-+				dev_warn(hub_dev,
-+					"config error on port %d\n",
-+					i);
-+				clear_port_feature(hub->hdev, i,
-+						USB_PORT_FEAT_C_PORT_CONFIG_ERROR);
-+			}
-+
-+			/* Warm reset a USB3 protocol port if it's in
-+			 * SS.Inactive state.
-+			 */
-+			if (hub_port_warm_reset_required(hub, portstatus)) {
-+				dev_dbg(hub_dev, "warm reset port %d\n", i);
-+				hub_port_reset(hub, i, NULL,
-+						HUB_BH_RESET_TIME, true);
-+			}
-+
-+			if (connect_change)
-+				hub_port_connect_change(hub, i,
-+						portstatus, portchange);
-+		} /* end for i */
-+
-+		/* deal with hub status changes */
-+		if (test_and_clear_bit(0, hub->event_bits) == 0)
-+			;	/* do nothing */
-+		else if (hub_hub_status(hub, &hubstatus, &hubchange) < 0)
-+			dev_err (hub_dev, "get_hub_status failed\n");
-+		else {
-+			if (hubchange & HUB_CHANGE_LOCAL_POWER) {
-+				dev_dbg (hub_dev, "power change\n");
-+				clear_hub_feature(hdev, C_HUB_LOCAL_POWER);
-+				if (hubstatus & HUB_STATUS_LOCAL_POWER)
-+					/* FIXME: Is this always true? */
-+					hub->limited_power = 1;
-+				else
-+					hub->limited_power = 0;
-+			}
-+			if (hubchange & HUB_CHANGE_OVERCURRENT) {
-+				u16 status = 0;
-+				u16 unused;
-+
-+				dev_dbg(hub_dev, "over-current change\n");
-+				clear_hub_feature(hdev, C_HUB_OVER_CURRENT);
-+				msleep(500);	/* Cool down */
-+                        	hub_power_on(hub, true);
-+				hub_hub_status(hub, &status, &unused);
-+				if (status & HUB_STATUS_OVERCURRENT)
-+					dev_err(hub_dev, "over-current "
-+						"condition\n");
-+			}
-+		}
-+
-+ loop_autopm:
-+		/* Balance the usb_autopm_get_interface() above */
-+		usb_autopm_put_interface_no_suspend(intf);
-+ loop:
-+		/* Balance the usb_autopm_get_interface_no_resume() in
-+		 * kick_khubd() and allow autosuspend.
-+		 */
-+		usb_autopm_put_interface(intf);
-+ loop_disconnected:
-+		usb_unlock_device(hdev);
-+		kref_put(&hub->kref, hub_release);
-+
-+        } /* end while (1) */
-+}
-+
-+static int hub_thread(void *__unused)
-+{
-+	/* khubd needs to be freezable to avoid intefering with USB-PERSIST
-+	 * port handover.  Otherwise it might see that a full-speed device
-+	 * was gone before the EHCI controller had handed its port over to
-+	 * the companion full-speed controller.
-+	 */
-+	set_freezable();
-+
-+	do {
-+		hub_events();
-+		wait_event_freezable(khubd_wait,
-+				!list_empty(&hub_event_list) ||
-+				kthread_should_stop());
-+	} while (!kthread_should_stop() || !list_empty(&hub_event_list));
-+
-+	pr_debug("%s: khubd exiting\n", usbcore_name);
-+	return 0;
-+}
-+
-+static const struct usb_device_id hub_id_table[] = {
-+    { .match_flags = USB_DEVICE_ID_MATCH_DEV_CLASS,
-+      .bDeviceClass = USB_CLASS_HUB},
-+    { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
-+      .bInterfaceClass = USB_CLASS_HUB},
-+    { }						/* Terminating entry */
-+};
-+
-+MODULE_DEVICE_TABLE (usb, hub_id_table);
-+
-+static struct usb_driver hub_driver = {
-+	.name =		"hub",
-+	.probe =	hub_probe,
-+	.disconnect =	hub_disconnect,
-+	.suspend =	hub_suspend,
-+	.resume =	hub_resume,
-+	.reset_resume =	hub_reset_resume,
-+	.pre_reset =	hub_pre_reset,
-+	.post_reset =	hub_post_reset,
-+	.unlocked_ioctl = hub_ioctl,
-+	.id_table =	hub_id_table,
-+	.supports_autosuspend =	1,
-+};
-+
-+int usb_hub_init(void)
-+{
-+	if (usb_register(&hub_driver) < 0) {
-+		printk(KERN_ERR "%s: can't register hub driver\n",
-+			usbcore_name);
-+		return -1;
-+	}
-+
-+	khubd_task = kthread_run(hub_thread, NULL, "khubd");
-+	if (!IS_ERR(khubd_task))
-+		return 0;
-+
-+	/* Fall through if kernel_thread failed */
-+	usb_deregister(&hub_driver);
-+	printk(KERN_ERR "%s: can't start khubd\n", usbcore_name);
-+
-+	return -1;
-+}
-+
-+void usb_hub_cleanup(void)
-+{
-+	kthread_stop(khubd_task);
-+
-+	/*
-+	 * Hub resources are freed for us by usb_deregister. It calls
-+	 * usb_driver_purge on every device which in turn calls that
-+	 * devices disconnect function if it is using this driver.
-+	 * The hub_disconnect function takes care of releasing the
-+	 * individual hub resources. -greg
-+	 */
-+	usb_deregister(&hub_driver);
-+} /* usb_hub_cleanup() */
-+
-+static int descriptors_changed(struct usb_device *udev,
-+		struct usb_device_descriptor *old_device_descriptor)
-+{
-+	int		changed = 0;
-+	unsigned	index;
-+	unsigned	serial_len = 0;
-+	unsigned	len;
-+	unsigned	old_length;
-+	int		length;
-+	char		*buf;
-+
-+	if (memcmp(&udev->descriptor, old_device_descriptor,
-+			sizeof(*old_device_descriptor)) != 0)
-+		return 1;
-+
-+	/* Since the idVendor, idProduct, and bcdDevice values in the
-+	 * device descriptor haven't changed, we will assume the
-+	 * Manufacturer and Product strings haven't changed either.
-+	 * But the SerialNumber string could be different (e.g., a
-+	 * different flash card of the same brand).
-+	 */
-+	if (udev->serial)
-+		serial_len = strlen(udev->serial) + 1;
-+
-+	len = serial_len;
-+	for (index = 0; index < udev->descriptor.bNumConfigurations; index++) {
-+		old_length = le16_to_cpu(udev->config[index].desc.wTotalLength);
-+		len = max(len, old_length);
-+	}
-+
-+	buf = kmalloc(len, GFP_NOIO);
-+	if (buf == NULL) {
-+		dev_err(&udev->dev, "no mem to re-read configs after reset\n");
-+		/* assume the worst */
-+		return 1;
-+	}
-+	for (index = 0; index < udev->descriptor.bNumConfigurations; index++) {
-+		old_length = le16_to_cpu(udev->config[index].desc.wTotalLength);
-+		length = usb_get_descriptor(udev, USB_DT_CONFIG, index, buf,
-+				old_length);
-+		if (length != old_length) {
-+			dev_dbg(&udev->dev, "config index %d, error %d\n",
-+					index, length);
-+			changed = 1;
-+			break;
-+		}
-+		if (memcmp (buf, udev->rawdescriptors[index], old_length)
-+				!= 0) {
-+			dev_dbg(&udev->dev, "config index %d changed (#%d)\n",
-+				index,
-+				((struct usb_config_descriptor *) buf)->
-+					bConfigurationValue);
-+			changed = 1;
-+			break;
-+		}
-+	}
-+
-+	if (!changed && serial_len) {
-+		length = usb_string(udev, udev->descriptor.iSerialNumber,
-+				buf, serial_len);
-+		if (length + 1 != serial_len) {
-+			dev_dbg(&udev->dev, "serial string error %d\n",
-+					length);
-+			changed = 1;
-+		} else if (memcmp(buf, udev->serial, length) != 0) {
-+			dev_dbg(&udev->dev, "serial string changed\n");
-+			changed = 1;
-+		}
-+	}
-+
-+	kfree(buf);
-+	return changed;
-+}
-+
-+/**
-+ * usb_reset_and_verify_device - perform a USB port reset to reinitialize a device
-+ * @udev: device to reset (not in SUSPENDED or NOTATTACHED state)
-+ *
-+ * WARNING - don't use this routine to reset a composite device
-+ * (one with multiple interfaces owned by separate drivers)!
-+ * Use usb_reset_device() instead.
-+ *
-+ * Do a port reset, reassign the device's address, and establish its
-+ * former operating configuration.  If the reset fails, or the device's
-+ * descriptors change from their values before the reset, or the original
-+ * configuration and altsettings cannot be restored, a flag will be set
-+ * telling khubd to pretend the device has been disconnected and then
-+ * re-connected.  All drivers will be unbound, and the device will be
-+ * re-enumerated and probed all over again.
-+ *
-+ * Returns 0 if the reset succeeded, -ENODEV if the device has been
-+ * flagged for logical disconnection, or some other negative error code
-+ * if the reset wasn't even attempted.
-+ *
-+ * The caller must own the device lock.  For example, it's safe to use
-+ * this from a driver probe() routine after downloading new firmware.
-+ * For calls that might not occur during probe(), drivers should lock
-+ * the device using usb_lock_device_for_reset().
-+ *
-+ * Locking exception: This routine may also be called from within an
-+ * autoresume handler.  Such usage won't conflict with other tasks
-+ * holding the device lock because these tasks should always call
-+ * usb_autopm_resume_device(), thereby preventing any unwanted autoresume.
-+ */
-+static int usb_reset_and_verify_device(struct usb_device *udev)
-+{
-+	struct usb_device		*parent_hdev = udev->parent;
-+	struct usb_hub			*parent_hub;
-+	struct usb_hcd			*hcd = bus_to_hcd(udev->bus);
-+	struct usb_device_descriptor	descriptor = udev->descriptor;
-+	int 				i, ret = 0;
-+	int				port1 = udev->portnum;
-+
-+	if (udev->state == USB_STATE_NOTATTACHED ||
-+			udev->state == USB_STATE_SUSPENDED) {
-+		dev_dbg(&udev->dev, "device reset not allowed in state %d\n",
-+				udev->state);
-+		return -EINVAL;
-+	}
-+
-+	if (!parent_hdev) {
-+		/* this requires hcd-specific logic; see ohci_restart() */
-+		dev_dbg(&udev->dev, "%s for root hub!\n", __func__);
-+		return -EISDIR;
-+	}
-+	parent_hub = hdev_to_hub(parent_hdev);
-+
-+	/* Disable LPM and LTM while we reset the device and reinstall the alt
-+	 * settings.  Device-initiated LPM settings, and system exit latency
-+	 * settings are cleared when the device is reset, so we have to set
-+	 * them up again.
-+	 */
-+	ret = usb_unlocked_disable_lpm(udev);
-+	if (ret) {
-+		dev_err(&udev->dev, "%s Failed to disable LPM\n.", __func__);
-+		goto re_enumerate;
-+	}
-+	ret = usb_disable_ltm(udev);
-+	if (ret) {
-+		dev_err(&udev->dev, "%s Failed to disable LTM\n.",
-+				__func__);
-+		goto re_enumerate;
-+	}
-+
-+	set_bit(port1, parent_hub->busy_bits);
-+	for (i = 0; i < SET_CONFIG_TRIES; ++i) {
-+
-+		/* ep0 maxpacket size may change; let the HCD know about it.
-+		 * Other endpoints will be handled by re-enumeration. */
-+		usb_ep0_reinit(udev);
-+		ret = hub_port_init(parent_hub, udev, port1, i);
-+		if (ret >= 0 || ret == -ENOTCONN || ret == -ENODEV)
-+			break;
-+	}
-+	clear_bit(port1, parent_hub->busy_bits);
-+
-+	if (ret < 0)
-+		goto re_enumerate;
-+ 
-+	/* Device might have changed firmware (DFU or similar) */
-+	if (descriptors_changed(udev, &descriptor)) {
-+		dev_info(&udev->dev, "device firmware changed\n");
-+		udev->descriptor = descriptor;	/* for disconnect() calls */
-+		goto re_enumerate;
-+  	}
-+
-+	/* Restore the device's previous configuration */
-+	if (!udev->actconfig)
-+		goto done;
-+
-+	mutex_lock(hcd->bandwidth_mutex);
-+	ret = usb_hcd_alloc_bandwidth(udev, udev->actconfig, NULL, NULL);
-+	if (ret < 0) {
-+		dev_warn(&udev->dev,
-+				"Busted HC?  Not enough HCD resources for "
-+				"old configuration.\n");
-+		mutex_unlock(hcd->bandwidth_mutex);
-+		goto re_enumerate;
-+	}
-+	ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-+			USB_REQ_SET_CONFIGURATION, 0,
-+			udev->actconfig->desc.bConfigurationValue, 0,
-+			NULL, 0, USB_CTRL_SET_TIMEOUT);
-+	if (ret < 0) {
-+		dev_err(&udev->dev,
-+			"can't restore configuration #%d (error=%d)\n",
-+			udev->actconfig->desc.bConfigurationValue, ret);
-+		mutex_unlock(hcd->bandwidth_mutex);
-+		goto re_enumerate;
-+  	}
-+	mutex_unlock(hcd->bandwidth_mutex);
-+	usb_set_device_state(udev, USB_STATE_CONFIGURED);
-+
-+	/* Put interfaces back into the same altsettings as before.
-+	 * Don't bother to send the Set-Interface request for interfaces
-+	 * that were already in altsetting 0; besides being unnecessary,
-+	 * many devices can't handle it.  Instead just reset the host-side
-+	 * endpoint state.
-+	 */
-+	for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
-+		struct usb_host_config *config = udev->actconfig;
-+		struct usb_interface *intf = config->interface[i];
-+		struct usb_interface_descriptor *desc;
-+
-+		desc = &intf->cur_altsetting->desc;
-+		if (desc->bAlternateSetting == 0) {
-+			usb_disable_interface(udev, intf, true);
-+			usb_enable_interface(udev, intf, true);
-+			ret = 0;
-+		} else {
-+			/* Let the bandwidth allocation function know that this
-+			 * device has been reset, and it will have to use
-+			 * alternate setting 0 as the current alternate setting.
-+			 */
-+			intf->resetting_device = 1;
-+			ret = usb_set_interface(udev, desc->bInterfaceNumber,
-+					desc->bAlternateSetting);
-+			intf->resetting_device = 0;
-+		}
-+		if (ret < 0) {
-+			dev_err(&udev->dev, "failed to restore interface %d "
-+				"altsetting %d (error=%d)\n",
-+				desc->bInterfaceNumber,
-+				desc->bAlternateSetting,
-+				ret);
-+			goto re_enumerate;
-+		}
-+	}
-+
-+done:
-+	/* Now that the alt settings are re-installed, enable LTM and LPM. */
-+	usb_unlocked_enable_lpm(udev);
-+	usb_enable_ltm(udev);
-+	return 0;
-+ 
-+re_enumerate:
-+	/* LPM state doesn't matter when we're about to destroy the device. */
-+	hub_port_logical_disconnect(parent_hub, port1);
-+	return -ENODEV;
-+}
-+
-+/**
-+ * usb_reset_device - warn interface drivers and perform a USB port reset
-+ * @udev: device to reset (not in SUSPENDED or NOTATTACHED state)
-+ *
-+ * Warns all drivers bound to registered interfaces (using their pre_reset
-+ * method), performs the port reset, and then lets the drivers know that
-+ * the reset is over (using their post_reset method).
-+ *
-+ * Return value is the same as for usb_reset_and_verify_device().
-+ *
-+ * The caller must own the device lock.  For example, it's safe to use
-+ * this from a driver probe() routine after downloading new firmware.
-+ * For calls that might not occur during probe(), drivers should lock
-+ * the device using usb_lock_device_for_reset().
-+ *
-+ * If an interface is currently being probed or disconnected, we assume
-+ * its driver knows how to handle resets.  For all other interfaces,
-+ * if the driver doesn't have pre_reset and post_reset methods then
-+ * we attempt to unbind it and rebind afterward.
-+ */
-+int usb_reset_device(struct usb_device *udev)
-+{
-+	int ret;
-+	int i;
-+	struct usb_host_config *config = udev->actconfig;
-+
-+	if (udev->state == USB_STATE_NOTATTACHED ||
-+			udev->state == USB_STATE_SUSPENDED) {
-+		dev_dbg(&udev->dev, "device reset not allowed in state %d\n",
-+				udev->state);
-+		return -EINVAL;
-+	}
-+
-+	/* Prevent autosuspend during the reset */
-+	usb_autoresume_device(udev);
-+
-+	if (config) {
-+		for (i = 0; i < config->desc.bNumInterfaces; ++i) {
-+			struct usb_interface *cintf = config->interface[i];
-+			struct usb_driver *drv;
-+			int unbind = 0;
-+
-+			if (cintf->dev.driver) {
-+				drv = to_usb_driver(cintf->dev.driver);
-+				if (drv->pre_reset && drv->post_reset)
-+					unbind = (drv->pre_reset)(cintf);
-+				else if (cintf->condition ==
-+						USB_INTERFACE_BOUND)
-+					unbind = 1;
-+				if (unbind)
-+					usb_forced_unbind_intf(cintf);
-+			}
-+		}
-+	}
-+
-+	ret = usb_reset_and_verify_device(udev);
-+
-+	if (config) {
-+		for (i = config->desc.bNumInterfaces - 1; i >= 0; --i) {
-+			struct usb_interface *cintf = config->interface[i];
-+			struct usb_driver *drv;
-+			int rebind = cintf->needs_binding;
-+
-+			if (!rebind && cintf->dev.driver) {
-+				drv = to_usb_driver(cintf->dev.driver);
-+				if (drv->post_reset)
-+					rebind = (drv->post_reset)(cintf);
-+				else if (cintf->condition ==
-+						USB_INTERFACE_BOUND)
-+					rebind = 1;
-+			}
-+			if (ret == 0 && rebind)
-+				usb_rebind_intf(cintf);
-+		}
-+	}
-+
-+	usb_autosuspend_device(udev);
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(usb_reset_device);
-+
-+
-+/**
-+ * usb_queue_reset_device - Reset a USB device from an atomic context
-+ * @iface: USB interface belonging to the device to reset
-+ *
-+ * This function can be used to reset a USB device from an atomic
-+ * context, where usb_reset_device() won't work (as it blocks).
-+ *
-+ * Doing a reset via this method is functionally equivalent to calling
-+ * usb_reset_device(), except for the fact that it is delayed to a
-+ * workqueue. This means that any drivers bound to other interfaces
-+ * might be unbound, as well as users from usbfs in user space.
-+ *
-+ * Corner cases:
-+ *
-+ * - Scheduling two resets at the same time from two different drivers
-+ *   attached to two different interfaces of the same device is
-+ *   possible; depending on how the driver attached to each interface
-+ *   handles ->pre_reset(), the second reset might happen or not.
-+ *
-+ * - If a driver is unbound and it had a pending reset, the reset will
-+ *   be cancelled.
-+ *
-+ * - This function can be called during .probe() or .disconnect()
-+ *   times. On return from .disconnect(), any pending resets will be
-+ *   cancelled.
-+ *
-+ * There is no no need to lock/unlock the @reset_ws as schedule_work()
-+ * does its own.
-+ *
-+ * NOTE: We don't do any reference count tracking because it is not
-+ *     needed. The lifecycle of the work_struct is tied to the
-+ *     usb_interface. Before destroying the interface we cancel the
-+ *     work_struct, so the fact that work_struct is queued and or
-+ *     running means the interface (and thus, the device) exist and
-+ *     are referenced.
-+ */
-+void usb_queue_reset_device(struct usb_interface *iface)
-+{
-+	schedule_work(&iface->reset_ws);
-+}
-+EXPORT_SYMBOL_GPL(usb_queue_reset_device);
 diff -Naur linux-3.6.7/drivers/usb/core/message.c linux-3.6.7.patch/drivers/usb/core/message.c
 --- linux-3.6.7/drivers/usb/core/message.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/core/message.c	2012-11-18 12:45:10.793337634 +0100
++++ linux-3.6.7.patch/drivers/usb/core/message.c	2012-11-18 20:53:35.218717211 +0100
 @@ -1877,6 +1877,85 @@
  	if (cp->string == NULL &&
  			!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
@@ -30137,7 +25252,7 @@ diff -Naur linux-3.6.7/drivers/usb/core/message.c linux-3.6.7.patch/drivers/usb/
  	usb_unlocked_enable_lpm(dev);
 diff -Naur linux-3.6.7/drivers/usb/core/otg_whitelist.h linux-3.6.7.patch/drivers/usb/core/otg_whitelist.h
 --- linux-3.6.7/drivers/usb/core/otg_whitelist.h	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/core/otg_whitelist.h	2012-11-18 12:45:10.794337654 +0100
++++ linux-3.6.7.patch/drivers/usb/core/otg_whitelist.h	2012-11-18 20:53:35.219717230 +0100
 @@ -19,33 +19,82 @@
  static struct usb_device_id whitelist_table [] = {
  
@@ -30355,7 +25470,7 @@ diff -Naur linux-3.6.7/drivers/usb/core/otg_whitelist.h linux-3.6.7.patch/driver
  
 diff -Naur linux-3.6.7/drivers/usb/gadget/file_storage.c linux-3.6.7.patch/drivers/usb/gadget/file_storage.c
 --- linux-3.6.7/drivers/usb/gadget/file_storage.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/gadget/file_storage.c	2012-11-18 12:45:10.796337692 +0100
++++ linux-3.6.7.patch/drivers/usb/gadget/file_storage.c	2012-11-18 20:53:35.221717268 +0100
 @@ -573,8 +573,37 @@
  	.iConfiguration =	FSG_STRING_CONFIG,
  	.bmAttributes =		USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
@@ -30485,7 +25600,7 @@ diff -Naur linux-3.6.7/drivers/usb/gadget/file_storage.c linux-3.6.7.patch/drive
  	if (!req)
 diff -Naur linux-3.6.7/drivers/usb/gadget/Kconfig linux-3.6.7.patch/drivers/usb/gadget/Kconfig
 --- linux-3.6.7/drivers/usb/gadget/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/gadget/Kconfig	2012-11-18 12:45:10.797337711 +0100
++++ linux-3.6.7.patch/drivers/usb/gadget/Kconfig	2012-11-18 20:53:35.222717287 +0100
 @@ -505,6 +505,12 @@
  	bool
  	depends on USB_GADGET_DUALSPEED
@@ -30501,7 +25616,7 @@ diff -Naur linux-3.6.7/drivers/usb/gadget/Kconfig linux-3.6.7.patch/drivers/usb/
  #
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/changes.txt linux-3.6.7.patch/drivers/usb/host/dwc_common_port/changes.txt
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/changes.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/changes.txt	2012-11-18 12:45:10.798337730 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/changes.txt	2012-11-18 20:53:35.223717306 +0100
 @@ -0,0 +1,174 @@
 +
 +dwc_read_reg32() and friends now take an additional parameter, a pointer to an
@@ -30679,7 +25794,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/changes.txt linux-3.6.7.
 +library code directly into a driver module, instead of as a standalone module.
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.6.7.patch/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/doc/doxygen.cfg	2012-11-18 12:45:10.798337730 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/doc/doxygen.cfg	2012-11-18 20:53:35.224717325 +0100
 @@ -0,0 +1,270 @@
 +# Doxyfile 1.4.5
 +
@@ -30953,7 +26068,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.
 +SEARCHENGINE           = NO
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.c	2012-11-18 12:45:10.799337749 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.c	2012-11-18 20:53:35.226717363 +0100
 @@ -0,0 +1,532 @@
 +/* =========================================================================
 + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $
@@ -31489,7 +26604,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.6.7.pat
 +#endif	/* DWC_CCLIB */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.h	2012-11-18 12:45:10.800337768 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.h	2012-11-18 20:53:35.227717382 +0100
 @@ -0,0 +1,225 @@
 +/* =========================================================================
 + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $
@@ -31718,7 +26833,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.6.7.pat
 +
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c	2012-11-18 12:45:10.802337808 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c	2012-11-18 20:53:35.228717401 +0100
 @@ -0,0 +1,1308 @@
 +#include "dwc_os.h"
 +#include "dwc_list.h"
@@ -33030,7 +28145,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-
 +}
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c	2012-11-18 12:45:10.803337828 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c	2012-11-18 20:53:35.230717439 +0100
 @@ -0,0 +1,1421 @@
 +#include <linux/kernel.h>
 +#include <linux/init.h>
@@ -34455,7 +29570,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux
 +#endif	/* DWC_LIBMODULE */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c	2012-11-18 12:45:10.805337868 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c	2012-11-18 20:53:35.232717477 +0100
 @@ -0,0 +1,1275 @@
 +#include "dwc_os.h"
 +#include "dwc_list.h"
@@ -35734,7 +30849,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-
 +}
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c	2012-11-18 12:45:10.805337868 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c	2012-11-18 20:53:35.232717477 +0100
 @@ -0,0 +1,308 @@
 +/* =========================================================================
 + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $
@@ -36046,7 +31161,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.6.7
 +#endif	/* DWC_CRYPTOLIB */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h	2012-11-18 12:45:10.806337888 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h	2012-11-18 20:53:35.233717496 +0100
 @@ -0,0 +1,111 @@
 +/* =========================================================================
 + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $
@@ -36161,7 +31276,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.6.7
 +#endif /* _DWC_CRYPTO_H_ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.c	2012-11-18 12:45:10.806337888 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.c	2012-11-18 20:53:35.234717515 +0100
 @@ -0,0 +1,291 @@
 +/* =========================================================================
 + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $
@@ -36456,7 +31571,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.6.7.pat
 +#endif /* DWC_CRYPTOLIB */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.h	2012-11-18 12:45:10.807337907 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.h	2012-11-18 20:53:35.234717515 +0100
 @@ -0,0 +1,106 @@
 +/* =========================================================================
 + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $
@@ -36566,7 +31681,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.6.7.pat
 +#endif /* _DWC_DH_H_ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_list.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_list.h	2012-11-18 12:45:10.808337926 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_list.h	2012-11-18 20:53:35.236717553 +0100
 @@ -0,0 +1,594 @@
 +/*	$OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $	*/
 +/*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
@@ -37164,7 +32279,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.6.7.p
 +#endif /* _DWC_LIST_H_ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_mem.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_mem.c	2012-11-18 12:45:10.809337945 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_mem.c	2012-11-18 20:53:35.236717553 +0100
 @@ -0,0 +1,245 @@
 +/* Memory Debugging */
 +#ifdef DWC_DEBUG_MEMORY
@@ -37413,7 +32528,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.6.7.pa
 +#endif /* DWC_DEBUG_MEMORY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c	2012-11-18 12:45:10.810337964 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c	2012-11-18 20:53:35.237717572 +0100
 @@ -0,0 +1,636 @@
 +/* Bignum routines adapted from PUTTY sources.  PuTTY copyright notice follows.
 + *
@@ -38053,7 +33168,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.6.7
 +#endif /*DWC_CRYPTOLIB */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h	2012-11-18 12:45:10.810337964 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h	2012-11-18 20:53:35.238717591 +0100
 @@ -0,0 +1,34 @@
 +/*
 + * dwc_modpow.h
@@ -38091,7 +33206,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.6.7
 +#endif /* _LINUX_BIGNUM_H */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c	2012-11-18 12:45:10.811337984 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c	2012-11-18 20:53:35.238717591 +0100
 @@ -0,0 +1,319 @@
 +#ifdef DWC_NOTIFYLIB
 +
@@ -38414,7 +33529,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.6
 +#endif	/* DWC_NOTIFYLIB */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h	2012-11-18 12:45:10.811337984 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h	2012-11-18 20:53:35.239717610 +0100
 @@ -0,0 +1,122 @@
 +
 +#ifndef __DWC_NOTIFIER_H__
@@ -38540,7 +33655,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.6
 +#endif /* __DWC_NOTIFIER_H__ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_os.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_os.h	2012-11-18 12:45:10.814338043 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_os.h	2012-11-18 20:53:35.241717648 +0100
 @@ -0,0 +1,1260 @@
 +/* =========================================================================
 + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $
@@ -39804,7 +34919,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.6.7.pat
 +#endif /* _DWC_OS_H_ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile	2012-11-18 12:45:10.814338043 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile	2012-11-18 20:53:35.242717667 +0100
 @@ -0,0 +1,58 @@
 +#
 +# Makefile for DWC_common library
@@ -39866,7 +34981,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile linux-3.6.7.pat
 +	rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.fbsd
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.fbsd	2012-11-18 12:45:10.814338043 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.fbsd	2012-11-18 20:53:35.242717667 +0100
 @@ -0,0 +1,17 @@
 +CFLAGS	+= -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include
 +CFLAGS	+= -DDWC_FREEBSD
@@ -39887,7 +35002,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.6.
 +.include <bsd.kmod.mk>
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.linux
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.linux	2012-11-18 12:45:10.815338062 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.linux	2012-11-18 20:53:35.244717705 +0100
 @@ -0,0 +1,49 @@
 +#
 +# Makefile for DWC_common library
@@ -39940,7 +35055,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.6
 +	rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/usb.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/usb.h
 --- linux-3.6.7/drivers/usb/host/dwc_common_port/usb.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/usb.h	2012-11-18 12:45:10.816338082 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/usb.h	2012-11-18 20:53:35.246717742 +0100
 @@ -0,0 +1,946 @@
 +/*
 + * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40890,7 +36005,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/usb.h linux-3.6.7.patch/
 +#endif /* _USB_H_ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.6.7.patch/drivers/usb/host/dwc_otg/doc/doxygen.cfg
 --- linux-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/doc/doxygen.cfg	2012-11-18 12:45:10.817338101 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/doc/doxygen.cfg	2012-11-18 20:53:35.247717761 +0100
 @@ -0,0 +1,224 @@
 +# Doxyfile 1.3.9.1
 +
@@ -41118,7 +36233,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.6.7.patc
 +SEARCHENGINE           = NO
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dummy_audio.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dummy_audio.c	2012-11-18 12:45:10.819338140 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dummy_audio.c	2012-11-18 20:53:35.249717799 +0100
 @@ -0,0 +1,1575 @@
 +/*
 + * zero.c -- Gadget Zero, for USB development
@@ -42697,7 +37812,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.6.7.patch/
 +module_exit (cleanup);
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h	2012-11-18 12:45:10.820338160 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h	2012-11-18 20:53:35.250717818 +0100
 @@ -0,0 +1,142 @@
 +/* ==========================================================================
 + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -42843,7 +37958,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.6.7.pat
 +#endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.c	2012-11-18 12:45:10.821338179 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.c	2012-11-18 20:53:35.251717837 +0100
 @@ -0,0 +1,854 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $
@@ -43701,7 +38816,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.6.7.patch/
 +}
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.h	2012-11-18 12:45:10.822338199 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.h	2012-11-18 20:53:35.251717837 +0100
 @@ -0,0 +1,80 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $
@@ -43785,7 +38900,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.6.7.patch/
 +#endif //__DWC_OTG_ADP_H__
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c	2012-11-18 12:45:10.823338218 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c	2012-11-18 20:53:35.253717875 +0100
 @@ -0,0 +1,1210 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $
@@ -44999,7 +40114,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.6.7.patch
 +}
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h	2012-11-18 12:45:10.824338238 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h	2012-11-18 20:53:35.254717894 +0100
 @@ -0,0 +1,89 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $
@@ -45092,7 +40207,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.6.7.patch
 +#endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c	2012-11-18 12:45:10.826338277 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c	2012-11-18 20:53:35.256717932 +0100
 @@ -0,0 +1,1876 @@
 +/* ==========================================================================
 + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -46972,7 +42087,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.6.7.patch/
 +#endif //DWC_UTE_CFI
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h	2012-11-18 12:45:10.827338296 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h	2012-11-18 20:53:35.257717951 +0100
 @@ -0,0 +1,320 @@
 +/* ==========================================================================
 + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -47296,7 +42411,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.6.7.patch/
 +#endif /* (__DWC_OTG_CFI_H__) */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c	2012-11-18 12:45:10.836338472 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c	2012-11-18 20:53:35.266718122 +0100
 @@ -0,0 +1,7151 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $
@@ -54451,7 +49566,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.6.7.patch/
 +}
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h	2012-11-18 12:45:10.839338530 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h	2012-11-18 20:53:35.269718177 +0100
 @@ -0,0 +1,1464 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $
@@ -55919,7 +51034,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.6.7.patch/
 +#endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c	2012-11-18 12:45:10.841338569 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c	2012-11-18 20:53:35.271718217 +0100
 @@ -0,0 +1,1571 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $
@@ -57494,7 +52609,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.6.7.p
 +}
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h	2012-11-18 12:45:10.842338589 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h	2012-11-18 20:53:35.272718237 +0100
 @@ -0,0 +1,705 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $
@@ -58203,7 +53318,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.6.7.pa
 +#endif				/* __DWC_CORE_IF_H__ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h	2012-11-18 12:45:10.843338608 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h	2012-11-18 20:53:35.273718256 +0100
 @@ -0,0 +1,117 @@
 +/* ==========================================================================
 + *
@@ -58324,7 +53439,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.6.7.patch/
 +#endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c	2012-11-18 12:45:10.845338648 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c	2012-11-18 20:53:35.276718311 +0100
 @@ -0,0 +1,1732 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
@@ -60060,7 +55175,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.6.7.pat
 +*/
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h	2012-11-18 12:45:10.846338667 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h	2012-11-18 20:53:35.276718311 +0100
 @@ -0,0 +1,86 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $
@@ -60150,7 +55265,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.6.7.pat
 +#endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c	2012-11-18 12:45:10.850338745 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c	2012-11-18 20:53:35.281718407 +0100
 @@ -0,0 +1,3498 @@
 +
 +/* ==========================================================================
@@ -63652,7 +58767,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.6.7.patch/
 +#endif /* DWC_DEVICE_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c	2012-11-18 12:45:10.852338784 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c	2012-11-18 20:53:35.283718445 +0100
 @@ -0,0 +1,1132 @@
 +/*==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $
@@ -64788,7 +59903,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.6.7.p
 +#endif /* DWC_DEVICE_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h	2012-11-18 12:45:10.853338804 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h	2012-11-18 20:53:35.284718464 +0100
 @@ -0,0 +1,829 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $
@@ -65621,7 +60736,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.6.7.patch/
 +#endif /* DWC_DEVICE_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h	2012-11-18 12:45:10.855338843 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h	2012-11-18 20:53:35.285718483 +0100
 @@ -0,0 +1,417 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $
@@ -66042,8 +61157,8 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.6.7.pat
 +#endif /* DWC_DEVICE_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c	2012-11-18 12:45:10.858338901 +0100
-@@ -0,0 +1,2246 @@
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c	2012-11-18 20:53:35.288718540 +0100
+@@ -0,0 +1,2248 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $
 + * $Revision: #89 $
@@ -66278,6 +61393,8 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.6.7.p
 +		if (mphi_int_count >= 60)
 +		{
 +			DWC_WRITE_REG32(c_mphi_regs.ctrl, ((1<<31) + (1<<16)));
++			while(!(DWC_READ_REG32(c_mphi_regs.ctrl) & (1 << 17)))
++				;
 +			DWC_WRITE_REG32(c_mphi_regs.ctrl, (1<<31));
 +			mphi_int_count = 0;
 +		}
@@ -68292,7 +63409,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.6.7.p
 +#endif /* DWC_DEVICE_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c	2012-11-18 12:45:10.859338921 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c	2012-11-18 20:53:35.290718578 +0100
 @@ -0,0 +1,938 @@
 +
 +/* ==========================================================================
@@ -69234,7 +64351,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.6.7.
 +#endif /* DWC_DEVICE_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c	2012-11-18 12:45:10.861338960 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c	2012-11-18 20:53:35.291718597 +0100
 @@ -0,0 +1,957 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $
@@ -70195,7 +65312,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.6.7.
 +#endif /* DWC_DEVICE_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c	2012-11-18 12:45:10.861338960 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c	2012-11-18 20:53:35.292718616 +0100
 @@ -0,0 +1,113 @@
 +#include "dwc_otg_regs.h"
 +#include "dwc_otg_dbg.h"
@@ -70312,7 +65429,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-3.6.7.p
 +}
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h	2012-11-18 12:45:10.862338979 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h	2012-11-18 20:53:35.292718616 +0100
 @@ -0,0 +1,36 @@
 +#ifndef __DWC_OTG_MPHI_FIX_H__
 +#define __DWC_OTG_MPHI_FIX_H__
@@ -70352,7 +65469,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-3.6.7.p
 +#endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h	2012-11-18 12:45:10.862338979 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h	2012-11-18 20:53:35.293718635 +0100
 @@ -0,0 +1,188 @@
 +#ifndef _DWC_OS_DEP_H_
 +#define _DWC_OS_DEP_H_
@@ -70544,7 +65661,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.6.7.pat
 +#endif /* _DWC_OS_DEP_H_ */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c	2012-11-18 12:45:10.865339038 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c	2012-11-18 20:53:35.296718692 +0100
 @@ -0,0 +1,2708 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $
@@ -73256,7 +68373,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.6.7.patch/
 +#endif /* DWC_HOST_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h	2012-11-18 12:45:10.867339077 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h	2012-11-18 20:53:35.297718711 +0100
 @@ -0,0 +1,266 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $
@@ -73526,7 +68643,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.6.7.patch/
 +#endif /* DWC_HOST_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h	2012-11-18 12:45:10.868339096 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h	2012-11-18 20:53:35.298718730 +0100
 @@ -0,0 +1,360 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $
@@ -73890,7 +69007,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.6.7.pat
 +#endif				/* DWC_HOST_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c	2012-11-18 12:45:10.874339213 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c	2012-11-18 20:53:35.304718844 +0100
 @@ -0,0 +1,5147 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $
@@ -79041,7 +74158,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.6.7.p
 +#endif /* DWC_HOST_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c	2012-11-18 12:45:10.876339252 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c	2012-11-18 20:53:35.306718882 +0100
 @@ -0,0 +1,1374 @@
 + /* ==========================================================================
 +  * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $
@@ -80419,7 +75536,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.6.7.
 +#endif /* DWC_HOST_ONLY */
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h
 --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h	2012-11-18 12:45:10.879339311 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h	2012-11-18 20:53:35.309718939 +0100
 @@ -0,0 +1,2550 @@
 +/* ==========================================================================
 + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $
@@ -82973,7 +78090,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.6.7.patch
 +#endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/Makefile linux-3.6.7.patch/drivers/usb/host/dwc_otg/Makefile
 --- linux-3.6.7/drivers/usb/host/dwc_otg/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/Makefile	2012-11-18 12:45:10.880339330 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/Makefile	2012-11-18 20:53:35.310718958 +0100
 @@ -0,0 +1,81 @@
 +#
 +# Makefile for DWC_otg Highspeed USB controller driver
@@ -83058,7 +78175,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/Makefile linux-3.6.7.patch/drive
 +endif
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
 --- linux-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm	2012-11-18 12:45:10.880339330 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm	2012-11-18 20:53:35.311718977 +0100
 @@ -0,0 +1,337 @@
 +package dwc_otg_test;
 +
@@ -83399,7 +78516,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.6.7
 +1;
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/Makefile linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/Makefile
 --- linux-3.6.7/drivers/usb/host/dwc_otg/test/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/Makefile	2012-11-18 12:45:10.881339350 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/Makefile	2012-11-18 20:53:35.311718977 +0100
 @@ -0,0 +1,16 @@
 +
 +PERL=/usr/bin/perl
@@ -83419,7 +78536,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/Makefile linux-3.6.7.patch/
 +	done
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_mod_param.pl
 --- linux-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_mod_param.pl	2012-11-18 12:45:10.881339350 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_mod_param.pl	2012-11-18 20:53:35.312718995 +0100
 @@ -0,0 +1,133 @@
 +#!/usr/bin/perl -w
 +# 
@@ -83556,7 +78673,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.6
 +0;
 diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_sysfs.pl
 --- linux-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_sysfs.pl	2012-11-18 12:45:10.882339369 +0100
++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_sysfs.pl	2012-11-18 20:53:35.312718995 +0100
 @@ -0,0 +1,193 @@
 +#!/usr/bin/perl -w
 +# 
@@ -83753,7 +78870,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.6.7.p
 +0;
 diff -Naur linux-3.6.7/drivers/usb/host/Kconfig linux-3.6.7.patch/drivers/usb/host/Kconfig
 --- linux-3.6.7/drivers/usb/host/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/Kconfig	2012-11-18 12:45:10.883339389 +0100
++++ linux-3.6.7.patch/drivers/usb/host/Kconfig	2012-11-18 20:53:35.313719014 +0100
 @@ -610,6 +610,19 @@
  	  To compile this driver a module, choose M here: the module
  	  will be called "hwa-hc".
@@ -83776,7 +78893,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/Kconfig linux-3.6.7.patch/drivers/usb/ho
         depends on USB && ARM && ARCH_MXC
 diff -Naur linux-3.6.7/drivers/usb/host/Makefile linux-3.6.7.patch/drivers/usb/host/Makefile
 --- linux-3.6.7/drivers/usb/host/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/host/Makefile	2012-11-18 12:45:10.883339389 +0100
++++ linux-3.6.7.patch/drivers/usb/host/Makefile	2012-11-18 20:53:35.314719033 +0100
 @@ -37,6 +37,8 @@
  obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
  obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
@@ -83788,7 +78905,7 @@ diff -Naur linux-3.6.7/drivers/usb/host/Makefile linux-3.6.7.patch/drivers/usb/h
  obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
 diff -Naur linux-3.6.7/drivers/usb/Makefile linux-3.6.7.patch/drivers/usb/Makefile
 --- linux-3.6.7/drivers/usb/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/usb/Makefile	2012-11-18 12:45:10.884339408 +0100
++++ linux-3.6.7.patch/drivers/usb/Makefile	2012-11-18 20:53:35.314719033 +0100
 @@ -25,6 +25,7 @@
  obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
  obj-$(CONFIG_USB_HWA_HCD)	+= host/
@@ -83799,7 +78916,7 @@ diff -Naur linux-3.6.7/drivers/usb/Makefile linux-3.6.7.patch/drivers/usb/Makefi
  
 diff -Naur linux-3.6.7/drivers/video/bcm2708_fb.c linux-3.6.7.patch/drivers/video/bcm2708_fb.c
 --- linux-3.6.7/drivers/video/bcm2708_fb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/video/bcm2708_fb.c	2012-11-18 12:45:10.885339428 +0100
++++ linux-3.6.7.patch/drivers/video/bcm2708_fb.c	2012-11-18 20:53:35.315719052 +0100
 @@ -0,0 +1,491 @@
 +/*
 + *  linux/drivers/video/bcm2708_fb.c
@@ -84294,7 +79411,7 @@ diff -Naur linux-3.6.7/drivers/video/bcm2708_fb.c linux-3.6.7.patch/drivers/vide
 +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
 diff -Naur linux-3.6.7/drivers/video/Kconfig linux-3.6.7.patch/drivers/video/Kconfig
 --- linux-3.6.7/drivers/video/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/video/Kconfig	2012-11-18 12:45:10.886339447 +0100
++++ linux-3.6.7.patch/drivers/video/Kconfig	2012-11-18 20:53:35.316719071 +0100
 @@ -312,6 +312,20 @@
  	help
  	  Support the Permedia2 FIFO disconnect feature.
@@ -84318,7 +79435,7 @@ diff -Naur linux-3.6.7/drivers/video/Kconfig linux-3.6.7.patch/drivers/video/Kco
  	depends on FB && ARM && ARM_AMBA
 diff -Naur linux-3.6.7/drivers/video/logo/logo_linux_clut224.ppm linux-3.6.7.patch/drivers/video/logo/logo_linux_clut224.ppm
 --- linux-3.6.7/drivers/video/logo/logo_linux_clut224.ppm	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/video/logo/logo_linux_clut224.ppm	2012-11-18 12:45:10.890339525 +0100
++++ linux-3.6.7.patch/drivers/video/logo/logo_linux_clut224.ppm	2012-11-18 20:53:35.321719166 +0100
 @@ -1,1604 +1,883 @@
  P3
 -# Standard 224-color Linux logo
@@ -86807,7 +81924,7 @@ diff -Naur linux-3.6.7/drivers/video/logo/logo_linux_clut224.ppm linux-3.6.7.pat
 +0 0 0  0 0 0  0 0 0
 diff -Naur linux-3.6.7/drivers/video/Makefile linux-3.6.7.patch/drivers/video/Makefile
 --- linux-3.6.7/drivers/video/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/video/Makefile	2012-11-18 12:45:10.891339545 +0100
++++ linux-3.6.7.patch/drivers/video/Makefile	2012-11-18 20:53:35.321719166 +0100
 @@ -99,6 +99,7 @@
  obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
  obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
@@ -86818,7 +81935,7 @@ diff -Naur linux-3.6.7/drivers/video/Makefile linux-3.6.7.patch/drivers/video/Ma
  obj-$(CONFIG_FB_CIRRUS)		  += cirrusfb.o
 diff -Naur linux-3.6.7/drivers/watchdog/bcm2708_wdog.c linux-3.6.7.patch/drivers/watchdog/bcm2708_wdog.c
 --- linux-3.6.7/drivers/watchdog/bcm2708_wdog.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/drivers/watchdog/bcm2708_wdog.c	2012-11-18 12:45:10.910339915 +0100
++++ linux-3.6.7.patch/drivers/watchdog/bcm2708_wdog.c	2012-11-18 20:53:35.322719185 +0100
 @@ -0,0 +1,385 @@
 +/*
 + *	Broadcom BCM2708 watchdog driver.
@@ -87207,7 +82324,7 @@ diff -Naur linux-3.6.7/drivers/watchdog/bcm2708_wdog.c linux-3.6.7.patch/drivers
 +
 diff -Naur linux-3.6.7/drivers/watchdog/Kconfig linux-3.6.7.patch/drivers/watchdog/Kconfig
 --- linux-3.6.7/drivers/watchdog/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/watchdog/Kconfig	2012-11-18 12:45:10.911339935 +0100
++++ linux-3.6.7.patch/drivers/watchdog/Kconfig	2012-11-18 20:53:35.323719204 +0100
 @@ -352,6 +352,12 @@
  	  To compile this driver as a module, choose M here: the
  	  module will be called imx2_wdt.
@@ -87223,7 +82340,7 @@ diff -Naur linux-3.6.7/drivers/watchdog/Kconfig linux-3.6.7.patch/drivers/watchd
  config AT32AP700X_WDT
 diff -Naur linux-3.6.7/drivers/watchdog/Makefile linux-3.6.7.patch/drivers/watchdog/Makefile
 --- linux-3.6.7/drivers/watchdog/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/drivers/watchdog/Makefile	2012-11-18 12:45:10.912339955 +0100
++++ linux-3.6.7.patch/drivers/watchdog/Makefile	2012-11-18 20:53:35.324719223 +0100
 @@ -52,6 +52,7 @@
  obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
  obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
@@ -87234,7 +82351,7 @@ diff -Naur linux-3.6.7/drivers/watchdog/Makefile linux-3.6.7.patch/drivers/watch
  obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
 diff -Naur linux-3.6.7/include/linux/broadcom/vc_cma.h linux-3.6.7.patch/include/linux/broadcom/vc_cma.h
 --- linux-3.6.7/include/linux/broadcom/vc_cma.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/include/linux/broadcom/vc_cma.h	2012-11-18 12:45:10.930340306 +0100
++++ linux-3.6.7.patch/include/linux/broadcom/vc_cma.h	2012-11-18 20:53:35.325719242 +0100
 @@ -0,0 +1,30 @@
 +/*****************************************************************************
 +* Copyright 2012 Broadcom Corporation.  All rights reserved.
@@ -87268,7 +82385,7 @@ diff -Naur linux-3.6.7/include/linux/broadcom/vc_cma.h linux-3.6.7.patch/include
 +
 diff -Naur linux-3.6.7/include/linux/mmc/host.h linux-3.6.7.patch/include/linux/mmc/host.h
 --- linux-3.6.7/include/linux/mmc/host.h	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/include/linux/mmc/host.h	2012-11-18 12:45:10.931340325 +0100
++++ linux-3.6.7.patch/include/linux/mmc/host.h	2012-11-18 20:53:35.325719242 +0100
 @@ -257,6 +257,7 @@
  #define MMC_CAP2_HC_ERASE_SZ	(1 << 9)	/* High-capacity erase size */
  #define MMC_CAP2_CD_ACTIVE_HIGH	(1 << 10)	/* Card-detect signal active high */
@@ -87279,7 +82396,7 @@ diff -Naur linux-3.6.7/include/linux/mmc/host.h linux-3.6.7.patch/include/linux/
  	unsigned int        power_notify_type;
 diff -Naur linux-3.6.7/include/linux/mmc/sdhci.h linux-3.6.7.patch/include/linux/mmc/sdhci.h
 --- linux-3.6.7/include/linux/mmc/sdhci.h	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/include/linux/mmc/sdhci.h	2012-11-18 12:45:10.931340325 +0100
++++ linux-3.6.7.patch/include/linux/mmc/sdhci.h	2012-11-18 20:53:35.326719261 +0100
 @@ -93,6 +93,7 @@
  #define SDHCI_QUIRK2_HOST_OFF_CARD_ON			(1<<0)
  
@@ -87306,7 +82423,7 @@ diff -Naur linux-3.6.7/include/linux/mmc/sdhci.h linux-3.6.7.patch/include/linux
  
 diff -Naur linux-3.6.7/kernel/module.c linux-3.6.7.patch/kernel/module.c
 --- linux-3.6.7/kernel/module.c	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/kernel/module.c	2012-11-18 12:45:10.933340363 +0100
++++ linux-3.6.7.patch/kernel/module.c	2012-11-18 20:53:35.327719280 +0100
 @@ -2675,20 +2675,23 @@
  	memset(ptr, 0, mod->core_size);
  	mod->module_core = ptr;
@@ -87346,7 +82463,7 @@ diff -Naur linux-3.6.7/kernel/module.c linux-3.6.7.patch/kernel/module.c
  	pr_debug("final section addresses:\n");
 diff -Naur linux-3.6.7/sound/arm/bcm2835.c linux-3.6.7.patch/sound/arm/bcm2835.c
 --- linux-3.6.7/sound/arm/bcm2835.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/bcm2835.c	2012-11-18 12:45:10.934340382 +0100
++++ linux-3.6.7.patch/sound/arm/bcm2835.c	2012-11-18 20:53:35.328719299 +0100
 @@ -0,0 +1,413 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -87763,7 +82880,7 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835.c linux-3.6.7.patch/sound/arm/bcm2835.c
 +MODULE_ALIAS("platform:bcm2835_alsa");
 diff -Naur linux-3.6.7/sound/arm/bcm2835-ctl.c linux-3.6.7.patch/sound/arm/bcm2835-ctl.c
 --- linux-3.6.7/sound/arm/bcm2835-ctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/bcm2835-ctl.c	2012-11-18 12:45:10.934340382 +0100
++++ linux-3.6.7.patch/sound/arm/bcm2835-ctl.c	2012-11-18 20:53:35.329719318 +0100
 @@ -0,0 +1,200 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -87967,7 +83084,7 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835-ctl.c linux-3.6.7.patch/sound/arm/bcm28
 +}
 diff -Naur linux-3.6.7/sound/arm/bcm2835.h linux-3.6.7.patch/sound/arm/bcm2835.h
 --- linux-3.6.7/sound/arm/bcm2835.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/bcm2835.h	2012-11-18 12:45:10.935340401 +0100
++++ linux-3.6.7.patch/sound/arm/bcm2835.h	2012-11-18 20:53:35.329719318 +0100
 @@ -0,0 +1,155 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -88126,7 +83243,7 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835.h linux-3.6.7.patch/sound/arm/bcm2835.h
 +#endif /* __SOUND_ARM_BCM2835_H */
 diff -Naur linux-3.6.7/sound/arm/bcm2835-pcm.c linux-3.6.7.patch/sound/arm/bcm2835-pcm.c
 --- linux-3.6.7/sound/arm/bcm2835-pcm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/bcm2835-pcm.c	2012-11-18 12:45:10.938340463 +0100
++++ linux-3.6.7.patch/sound/arm/bcm2835-pcm.c	2012-11-18 20:53:35.330719337 +0100
 @@ -0,0 +1,408 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -88538,7 +83655,7 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835-pcm.c linux-3.6.7.patch/sound/arm/bcm28
 +}
 diff -Naur linux-3.6.7/sound/arm/bcm2835-vchiq.c linux-3.6.7.patch/sound/arm/bcm2835-vchiq.c
 --- linux-3.6.7/sound/arm/bcm2835-vchiq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/bcm2835-vchiq.c	2012-11-18 12:45:10.939340483 +0100
++++ linux-3.6.7.patch/sound/arm/bcm2835-vchiq.c	2012-11-18 20:53:35.331719356 +0100
 @@ -0,0 +1,826 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
@@ -89368,7 +84485,7 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835-vchiq.c linux-3.6.7.patch/sound/arm/bcm
 +}
 diff -Naur linux-3.6.7/sound/arm/Kconfig linux-3.6.7.patch/sound/arm/Kconfig
 --- linux-3.6.7/sound/arm/Kconfig	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/Kconfig	2012-11-18 12:45:10.939340483 +0100
++++ linux-3.6.7.patch/sound/arm/Kconfig	2012-11-18 20:53:35.332719375 +0100
 @@ -39,5 +39,12 @@
  	  Say Y or M if you want to support any AC97 codec attached to
  	  the PXA2xx AC97 interface.
@@ -89384,7 +84501,7 @@ diff -Naur linux-3.6.7/sound/arm/Kconfig linux-3.6.7.patch/sound/arm/Kconfig
  
 diff -Naur linux-3.6.7/sound/arm/Makefile linux-3.6.7.patch/sound/arm/Makefile
 --- linux-3.6.7/sound/arm/Makefile	2012-11-17 22:21:23.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/Makefile	2012-11-18 12:45:10.940340502 +0100
++++ linux-3.6.7.patch/sound/arm/Makefile	2012-11-18 20:53:35.332719375 +0100
 @@ -14,3 +14,9 @@
  
  obj-$(CONFIG_SND_PXA2XX_AC97)	+= snd-pxa2xx-ac97.o
@@ -89397,7 +84514,7 @@ diff -Naur linux-3.6.7/sound/arm/Makefile linux-3.6.7.patch/sound/arm/Makefile
 +
 diff -Naur linux-3.6.7/sound/arm/vc_vchi_audioserv_defs.h linux-3.6.7.patch/sound/arm/vc_vchi_audioserv_defs.h
 --- linux-3.6.7/sound/arm/vc_vchi_audioserv_defs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.7.patch/sound/arm/vc_vchi_audioserv_defs.h	2012-11-18 12:45:10.940340502 +0100
++++ linux-3.6.7.patch/sound/arm/vc_vchi_audioserv_defs.h	2012-11-18 20:53:35.333719393 +0100
 @@ -0,0 +1,114 @@
 +/*****************************************************************************
 +* Copyright 2011 Broadcom Corporation.  All rights reserved.
diff --git a/packages/linux/patches/linux-3.6.7-602-RPi_vc04-service_downgrade.patch b/packages/linux/patches/linux-3.6.7-602-RPi_vc04-service_downgrade.patch
deleted file mode 100644
index 97a0fc5af3..0000000000
--- a/packages/linux/patches/linux-3.6.7-602-RPi_vc04-service_downgrade.patch
+++ /dev/null
@@ -1,25171 +0,0 @@
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h	2012-10-21 15:15:09.998259693 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h	2012-10-17 18:57:47.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010-2012 Broadcom. All rights reserved.
-+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -19,10 +19,6 @@
- #ifndef CONNECTION_H_
- #define CONNECTION_H_
- 
--#include <linux/kernel.h>
--#include <linux/types.h>
--#include <linux/semaphore.h>
--
- #include "interface/vchi/vchi_cfg_internal.h"
- #include "interface/vchi/vchi_common.h"
- #include "interface/vchi/message_drivers/message.h"
-@@ -54,15 +50,15 @@
- 
- // Routine to create a service
- typedef int32_t (*VCHI_CONNECTION_SERVICE_CONNECT_T)( VCHI_CONNECTION_STATE_T *state_handle,
--                                                      int32_t service_id,
-+                                                      vcos_fourcc_t service_id,
-                                                       uint32_t rx_fifo_size,
-                                                       uint32_t tx_fifo_size,
-                                                       int server,
-                                                       VCHI_CALLBACK_T callback,
-                                                       void *callback_param,
--                                                      int32_t want_crc,
--                                                      int32_t want_unaligned_bulk_rx,
--                                                      int32_t want_unaligned_bulk_tx,
-+                                                      vcos_bool_t want_crc,
-+                                                      vcos_bool_t want_unaligned_bulk_rx,
-+                                                      vcos_bool_t want_unaligned_bulk_tx,
-                                                       VCHI_CONNECTION_SERVICE_HANDLE_T *service_handle );
- 
- // Routine to close a service
-@@ -120,7 +116,7 @@
-                                                     uint32_t *rx_timestamp );
- 
- // Routine to check whether the iterator has a next message
--typedef int32_t (*VCHI_CONNECTION_MSG_ITER_HAS_NEXT_T)( VCHI_CONNECTION_SERVICE_HANDLE_T service,
-+typedef vcos_bool_t (*VCHI_CONNECTION_MSG_ITER_HAS_NEXT_T)( VCHI_CONNECTION_SERVICE_HANDLE_T service,
-                                                        const VCHI_MSG_ITER_T *iter );
- 
- // Routine to advance the iterator
-@@ -153,7 +149,7 @@
-                                                          void *bulk_handle );
- 
- // Routine to report if a server is available
--typedef int32_t (*VCHI_CONNECTION_SERVER_PRESENT)( VCHI_CONNECTION_STATE_T *state, int32_t service_id, int32_t peer_flags );
-+typedef int32_t (*VCHI_CONNECTION_SERVER_PRESENT)( VCHI_CONNECTION_STATE_T *state, vcos_fourcc_t service_id, int32_t peer_flags );
- 
- // Routine to report the number of RX slots available
- typedef int (*VCHI_CONNECTION_RX_SLOTS_AVAILABLE)( const VCHI_CONNECTION_STATE_T *state );
-@@ -163,7 +159,7 @@
- 
- // Callback to indicate that the other side has added a buffer to the rx bulk DMA FIFO
- typedef void (*VCHI_CONNECTION_RX_BULK_BUFFER_ADDED)(VCHI_CONNECTION_STATE_T *state,
--                                                     int32_t service,
-+                                                     vcos_fourcc_t service,
-                                                      uint32_t length,
-                                                      MESSAGE_TX_CHANNEL_T channel,
-                                                      uint32_t channel_params,
-@@ -171,10 +167,10 @@
-                                                      uint32_t data_offset);
- 
- // Callback to inform a service that a Xon or Xoff message has been received
--typedef void (*VCHI_CONNECTION_FLOW_CONTROL)(VCHI_CONNECTION_STATE_T *state, int32_t service_id, int32_t xoff);
-+typedef void (*VCHI_CONNECTION_FLOW_CONTROL)(VCHI_CONNECTION_STATE_T *state, vcos_fourcc_t service_id, int32_t xoff);
- 
- // Callback to inform a service that a server available reply message has been received
--typedef void (*VCHI_CONNECTION_SERVER_AVAILABLE_REPLY)(VCHI_CONNECTION_STATE_T *state, int32_t service_id, uint32_t flags);
-+typedef void (*VCHI_CONNECTION_SERVER_AVAILABLE_REPLY)(VCHI_CONNECTION_STATE_T *state, vcos_fourcc_t service_id, uint32_t flags);
- 
- // Callback to indicate that bulk auxiliary messages have arrived
- typedef void (*VCHI_CONNECTION_BULK_AUX_RECEIVED)(VCHI_CONNECTION_STATE_T *state);
-@@ -189,7 +185,7 @@
- typedef void (*VCHI_CONNECTION_DISCONNECT)(VCHI_CONNECTION_STATE_T *state, uint32_t flags);
- 
- // Callback to inform of a power control request
--typedef void (*VCHI_CONNECTION_POWER_CONTROL)(VCHI_CONNECTION_STATE_T *state, MESSAGE_TX_CHANNEL_T channel, int32_t enable);
-+typedef void (*VCHI_CONNECTION_POWER_CONTROL)(VCHI_CONNECTION_STATE_T *state, MESSAGE_TX_CHANNEL_T channel, vcos_bool_t enable);
- 
- // allocate memory suitably aligned for this connection
- typedef void * (*VCHI_BUFFER_ALLOCATE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_handle, uint32_t * length);
-@@ -303,7 +299,7 @@
-    const VCHI_CONNECTION_API_T *api;
-    VCHI_CONNECTION_STATE_T     *state;
- #ifdef VCHI_COARSE_LOCKING
--   struct semaphore             sem;
-+   VCOS_SEMAPHORE_T             sem;
- #endif
- };
- 
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h	2012-10-21 15:15:09.999259713 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h	2012-10-17 18:57:47.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010-2012 Broadcom. All rights reserved.
-+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -19,11 +19,8 @@
- #ifndef _VCHI_MESSAGE_H_
- #define _VCHI_MESSAGE_H_
- 
--#include <linux/kernel.h>
--#include <linux/types.h>
--#include <linux/semaphore.h>
--
- #include "interface/vchi/vchi_cfg_internal.h"
-+#include "interface/vcos/vcos.h"
- #include "interface/vchi/vchi_common.h"
- 
- 
-@@ -66,7 +63,7 @@
-    struct rx_msg_slot_info *next;
-    //struct slot_info *prev;
- #if !defined VCHI_COARSE_LOCKING
--   struct semaphore   sem;
-+   VCOS_SEMAPHORE_T   sem;
- #endif
- 
-    uint8_t           *addr;               // base address of slot
-@@ -87,7 +84,7 @@
- typedef struct rx_bulk_slotinfo_t {
-    struct rx_bulk_slotinfo_t *next;
- 
--   struct semaphore *blocking;
-+   VCOS_SEMAPHORE_T *blocking;
- 
-    // needed by DMA
-    void        *addr;
-@@ -130,7 +127,7 @@
-       uint16_t slot_delta;     // whether this message indicated slot delta
-       uint32_t len;            // length of message
-       RX_MSG_SLOTINFO_T *slot; // slot this message is in
--      int32_t  service;   // service id this message is destined for
-+      vcos_fourcc_t service;   // service id this message is destined for
-       uint32_t tx_timestamp;   // timestamp from the header
-       uint32_t rx_timestamp;   // timestamp when we parsed it
-    } message;
-@@ -159,14 +156,14 @@
-    VCHI_MDRIVER_HANDLE_T *(*open)( VCHI_MESSAGE_DRIVER_OPEN_T *params, void *state );
-    int32_t (*suspending)( VCHI_MDRIVER_HANDLE_T *handle );
-    int32_t (*resumed)( VCHI_MDRIVER_HANDLE_T *handle );
--   int32_t (*power_control)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T, int32_t enable );
-+   int32_t (*power_control)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T, vcos_bool_t enable );
-    int32_t (*add_msg_rx_slot)( VCHI_MDRIVER_HANDLE_T *handle, RX_MSG_SLOTINFO_T *slot );      // rx message
-    int32_t (*add_bulk_rx)( VCHI_MDRIVER_HANDLE_T *handle, void *data, uint32_t len, RX_BULK_SLOTINFO_T *slot );  // rx data (bulk)
-    int32_t (*send)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel, const void *data, uint32_t len, VCHI_MSG_FLAGS_T flags, void *send_handle );      // tx (message & bulk)
-    void    (*next_event)( VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_EVENT_T *event );     // get the next event from message_driver
-    int32_t (*enable)( VCHI_MDRIVER_HANDLE_T *handle );
--   int32_t (*form_message)( VCHI_MDRIVER_HANDLE_T *handle, int32_t service_id, VCHI_MSG_VECTOR_T *vector, uint32_t count, void
--                            *address, uint32_t length_avail, uint32_t max_total_length, int32_t pad_to_fill, int32_t allow_partial );
-+   int32_t (*form_message)( VCHI_MDRIVER_HANDLE_T *handle, vcos_fourcc_t service_id, VCHI_MSG_VECTOR_T *vector, uint32_t count, void
-+                            *address, uint32_t length_avail, uint32_t max_total_length, vcos_bool_t pad_to_fill, vcos_bool_t allow_partial );
- 
-    int32_t (*update_message)( VCHI_MDRIVER_HANDLE_T *handle, void *dest, int16_t *slot_count );
-    int32_t (*buffer_aligned)( VCHI_MDRIVER_HANDLE_T *handle, int tx, int uncached, const void *address, const uint32_t length );
-@@ -175,7 +172,7 @@
-    int     (*rx_slot_size)( VCHI_MDRIVER_HANDLE_T *handle, int msg_size );
-    int     (*tx_slot_size)( VCHI_MDRIVER_HANDLE_T *handle, int msg_size );
- 
--   int32_t  (*tx_supports_terminate)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
-+   vcos_bool_t  (*tx_supports_terminate)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
-    uint32_t (*tx_bulk_chunk_size)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
-    int     (*tx_alignment)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_TX_CHANNEL_T channel );
-    int     (*rx_alignment)( const VCHI_MDRIVER_HANDLE_T *handle, MESSAGE_RX_CHANNEL_T channel );
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h	2012-10-21 15:15:10.000259733 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h	2012-10-17 18:57:47.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010-2012 Broadcom. All rights reserved.
-+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -16,6 +16,11 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+/*=============================================================================
-+Contains the #defines for the number of servers / clients etc, these can be
-+over-ridden from the platform makefile if needed
-+=============================================================================*/
-+
- #ifndef VCHI_CFG_H_
- #define VCHI_CFG_H_
- 
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h	2012-10-21 15:15:10.000259733 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h	2012-10-17 18:57:47.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010-2012 Broadcom. All rights reserved.
-+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h	2012-10-21 15:15:10.001259753 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h	2012-10-17 18:57:47.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010-2012 Broadcom. All rights reserved.
-+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -16,6 +16,10 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+/*=============================================================================
-+Contains global defs used by submodules within vchi.
-+=============================================================================*/
-+
- #ifndef VCHI_COMMON_H_
- #define VCHI_COMMON_H_
- 
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi.h	2012-10-21 15:15:09.999259713 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi.h	2012-10-17 18:57:47.000000000 +0200
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2010-2012 Broadcom. All rights reserved.
-+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -16,9 +16,14 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+/*=============================================================================
-+Contains the protypes for the vchi functions.
-+=============================================================================*/
-+
- #ifndef VCHI_H_
- #define VCHI_H_
- 
-+#include "interface/vcos/vcos.h"
- #include "interface/vchi/vchi_cfg.h"
- #include "interface/vchi/vchi_common.h"
- #include "interface/vchi/connections/connection.h"
-@@ -39,12 +44,6 @@
- #define VCHI_BULK_ALIGNED(x)      (((unsigned long)(x) & (VCHI_BULK_ALIGN-1)) == 0)
- #endif
- 
--struct vchi_version {
--	uint32_t version;
--	uint32_t version_min;
--};
--#define VCHI_VERSION(v_) { v_, v_ }
--#define VCHI_VERSION_EX(v_, m_) { v_, m_ }
- 
- typedef enum
- {
-@@ -89,8 +88,8 @@
- // Construct an entry in a msg vector for a message handle (h), starting at offset (o) of length (l)
- #define VCHI_VEC_HANDLE(h,o,l) VCHI_VEC_HANDLE,  { { (h), (o), (l) } }
- 
--// Macros to manipulate 'FOURCC' values
--#define MAKE_FOURCC(x) ((int32_t)( (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3] ))
-+// Macros to manipulate fourcc_t values
-+#define MAKE_FOURCC(x) ((fourcc_t)( (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3] ))
- #define FOURCC_TO_CHAR(x) (x >> 24) & 0xFF,(x >> 16) & 0xFF,(x >> 8) & 0xFF, x & 0xFF
- 
- 
-@@ -109,22 +108,15 @@
- 
- // structure used to provide the information needed to open a server or a client
- typedef struct {
--	struct vchi_version version;
--	int32_t service_id;
--	VCHI_CONNECTION_T *connection;
--	uint32_t rx_fifo_size;
--	uint32_t tx_fifo_size;
--	VCHI_CALLBACK_T callback;
--	void *callback_param;
--	/* client intends to receive bulk transfers of
--		odd lengths or into unaligned buffers */
--	int32_t want_unaligned_bulk_rx;
--	/* client intends to transmit bulk transfers of
--		odd lengths or out of unaligned buffers */
--	int32_t want_unaligned_bulk_tx;
--	/* client wants to check CRCs on (bulk) xfers.
--		Only needs to be set at 1 end - will do both directions. */
--	int32_t want_crc;
-+   vcos_fourcc_t service_id;
-+   VCHI_CONNECTION_T *connection;
-+   uint32_t rx_fifo_size;
-+   uint32_t tx_fifo_size;
-+   VCHI_CALLBACK_T callback;
-+   void *callback_param;
-+   vcos_bool_t want_unaligned_bulk_rx;    // client intends to receive bulk transfers of odd lengths or into unaligned buffers
-+   vcos_bool_t want_unaligned_bulk_tx;    // client intends to transmit bulk transfers of odd lengths or out of unaligned buffers
-+   vcos_bool_t want_crc;                  // client wants to check CRCs on (bulk) transfers. Only needs to be set at 1 end - will do both directions.
- } SERVICE_CREATION_T;
- 
- // Opaque handle for a VCHI instance
-@@ -277,7 +269,7 @@
- extern int32_t vchi_held_msg_release( VCHI_HELD_MSG_T *message );
- 
- // Indicates whether the iterator has a next message.
--extern int32_t vchi_msg_iter_has_next( const VCHI_MSG_ITER_T *iter );
-+extern vcos_bool_t vchi_msg_iter_has_next( const VCHI_MSG_ITER_T *iter );
- 
- // Return the pointer and length for the next message and advance the iterator.
- extern int32_t vchi_msg_iter_next( VCHI_MSG_ITER_T *iter,
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h	2012-10-21 15:15:10.001259753 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h	2012-10-17 18:57:47.000000000 +0200
-@@ -19,7 +19,7 @@
- #ifndef VCHI_MH_H_
- #define VCHI_MH_H_
- 
--#include <linux/types.h>
-+#include <interface/vcos/vcos.h>
- 
- typedef int32_t VCHI_MEM_HANDLE_T;
- #define VCHI_MEM_HANDLE_INVALID 0
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	2012-10-21 15:15:10.003259792 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	2012-10-17 18:57:47.000000000 +0200
-@@ -24,9 +24,9 @@
- #include <linux/pagemap.h>
- #include <linux/dma-mapping.h>
- #include <linux/version.h>
--#include <linux/io.h>
--#include <linux/uaccess.h>
- #include <asm/pgtable.h>
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
- 
- #include <mach/irqs.h>
- 
-@@ -40,14 +40,10 @@
- 
- #include "vchiq_arm.h"
- #include "vchiq_2835.h"
--#include "vchiq_connected.h"
- 
- #define MAX_FRAGMENTS (VCHIQ_NUM_CURRENT_BULKS * 2)
- 
--typedef struct vchiq_2835_state_struct {
--   int inited;
--   VCHIQ_ARM_STATE_T arm_state;
--} VCHIQ_2835_ARM_STATE_T;
-+#define VCOS_LOG_CATEGORY (&vchiq_arm_log_category)
- 
- static char *g_slot_mem;
- static int g_slot_mem_size;
-@@ -56,21 +52,29 @@
- static FRAGMENTS_T *g_free_fragments;
- struct semaphore g_free_fragments_sema;
- 
--extern int vchiq_arm_log_level;
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
- static DEFINE_SEMAPHORE(g_free_fragments_mutex);
-+#else
-+static DECLARE_MUTEX(g_free_fragments_mutex);
-+#endif
- 
- static irqreturn_t
- vchiq_doorbell_irq(int irq, void *dev_id);
- 
- static int
- create_pagelist(char __user *buf, size_t count, unsigned short type,
--                struct task_struct *task, PAGELIST_T ** ppagelist);
-+	struct task_struct *task, PAGELIST_T ** ppagelist);
- 
- static void
- free_pagelist(PAGELIST_T *pagelist, int actual);
- 
- int __init
-+vchiq_platform_vcos_init(void)
-+{
-+	return (vcos_init() == VCOS_SUCCESS) ? 0 : -EINVAL;
-+}
-+
-+int __init
- vchiq_platform_init(VCHIQ_STATE_T *state)
- {
- 	VCHIQ_SLOT_ZERO_T *vchiq_slot_zero;
-@@ -86,49 +90,48 @@
- 		&g_slot_phys, GFP_ATOMIC);
- 
- 	if (!g_slot_mem) {
--		vchiq_log_error(vchiq_arm_log_level,
--			"Unable to allocate channel memory");
-+		vcos_log_error("Unable to allocate channel memory");
- 		err = -ENOMEM;
- 		goto failed_alloc;
- 	}
- 
--	WARN_ON(((int)g_slot_mem & (PAGE_SIZE - 1)) != 0);
-+	vcos_assert(((int)g_slot_mem & (PAGE_SIZE - 1)) == 0);
- 
- 	vchiq_slot_zero = vchiq_init_slots(g_slot_mem, g_slot_mem_size);
--	if (!vchiq_slot_zero) {
--		err = -EINVAL;
--		goto failed_init_slots;
-+	if (!vchiq_slot_zero)
-+	{
-+	   err = -EINVAL;
-+	   goto failed_init_slots;
- 	}
- 
--	vchiq_slot_zero->platform_data[VCHIQ_PLATFORM_FRAGMENTS_OFFSET_IDX] =
--		(int)g_slot_phys + g_slot_mem_size;
--	vchiq_slot_zero->platform_data[VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX] =
--		MAX_FRAGMENTS;
-+	vchiq_slot_zero->platform_data[VCHIQ_PLATFORM_FRAGMENTS_OFFSET_IDX] = (int)g_slot_phys + g_slot_mem_size;
-+	vchiq_slot_zero->platform_data[VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX] = MAX_FRAGMENTS;
- 
- 	g_fragments_base = (FRAGMENTS_T *)(g_slot_mem + g_slot_mem_size);
- 	g_slot_mem_size += frag_mem_size;
- 
- 	g_free_fragments = g_fragments_base;
- 	for (i = 0; i < (MAX_FRAGMENTS - 1); i++) {
--		*(FRAGMENTS_T **)&g_fragments_base[i] =
-+		*(FRAGMENTS_T **) & g_fragments_base[i] =
- 			&g_fragments_base[i + 1];
- 	}
--	*(FRAGMENTS_T **)&g_fragments_base[i] = NULL;
-+	*(FRAGMENTS_T **) & g_fragments_base[i] = NULL;
- 	sema_init(&g_free_fragments_sema, MAX_FRAGMENTS);
- 
- 	if (vchiq_init_state(state, vchiq_slot_zero, 0/*slave*/) !=
--		VCHIQ_SUCCESS) {
-+		VCHIQ_SUCCESS)
-+	{
- 		err = -EINVAL;
- 		goto failed_vchiq_init;
- 	}
- 
- 	err = request_irq(VCHIQ_DOORBELL_IRQ, vchiq_doorbell_irq,
--		IRQF_IRQPOLL, "VCHIQ doorbell",
-+		IRQF_SAMPLE_RANDOM | IRQF_IRQPOLL, "VCHIQ doorbell",
- 		state);
--	if (err < 0) {
--		vchiq_log_error(vchiq_arm_log_level, "%s: failed to register "
--			"irq=%d err=%d", __func__,
--			VCHIQ_DOORBELL_IRQ, err);
-+	if (err < 0)
-+	{
-+		printk( KERN_ERR "%s: failed to register irq=%d err=%d\n", __func__,
-+			VCHIQ_DOORBELL_IRQ, err );
- 		goto failed_request_irq;
- 	}
- 
-@@ -138,67 +141,39 @@
- 
- 	bcm_mailbox_write(MBOX_CHAN_VCHIQ, (unsigned int)g_slot_phys);
- 
--	vchiq_log_info(vchiq_arm_log_level,
--		"vchiq_init - done (slots %x, phys %x)",
-+	vcos_log_info("vchiq_init - done (slots %x, phys %x)",
- 		(unsigned int)vchiq_slot_zero, g_slot_phys);
- 
--   vchiq_call_connected_callbacks();
--
--   return 0;
-+	return 0;
- 
- failed_request_irq:
- failed_vchiq_init:
- failed_init_slots:
--   dma_free_coherent(NULL, g_slot_mem_size, g_slot_mem, g_slot_phys);
-+	dma_free_coherent(NULL, g_slot_mem_size, g_slot_mem, g_slot_phys);
- 
- failed_alloc:
--   return err;
-+	return err;
- }
- 
- void __exit
- vchiq_platform_exit(VCHIQ_STATE_T *state)
- {
--   free_irq(VCHIQ_DOORBELL_IRQ, state);
--   dma_free_coherent(NULL, g_slot_mem_size,
--                     g_slot_mem, g_slot_phys);
--}
--
--
--VCHIQ_STATUS_T
--vchiq_platform_init_state(VCHIQ_STATE_T *state)
--{
--   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
--   state->platform_state = kzalloc(sizeof(VCHIQ_2835_ARM_STATE_T), GFP_KERNEL);
--   ((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->inited = 1;
--   status = vchiq_arm_init_state(state, &((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->arm_state);
--   if(status != VCHIQ_SUCCESS)
--   {
--      ((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->inited = 0;
--   }
--   return status;
--}
--
--VCHIQ_ARM_STATE_T*
--vchiq_platform_get_arm_state(VCHIQ_STATE_T *state)
--{
--   if(!((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->inited)
--   {
--      BUG();
--   }
--   return &((VCHIQ_2835_ARM_STATE_T*)state->platform_state)->arm_state;
-+	free_irq(VCHIQ_DOORBELL_IRQ, state);
-+	dma_free_coherent(NULL, g_slot_mem_size,
-+		g_slot_mem, g_slot_phys);
- }
- 
- void
- remote_event_signal(REMOTE_EVENT_T *event)
- {
--	wmb();
--
- 	event->fired = 1;
- 
--	dsb();         /* data barrier operation */
-+	/* The test on the next line also ensures the write on the previous line
-+		has completed */
- 
- 	if (event->armed) {
- 		/* trigger vc interrupt */
-+		dsb();         /* data barrier operation */
- 
- 		writel(0, __io_address(ARM_0_BELL2));
- 	}
-@@ -207,10 +182,13 @@
- int
- vchiq_copy_from_user(void *dst, const void *src, int size)
- {
--	if ((uint32_t)src < TASK_SIZE) {
-+	if ( (uint32_t)src < TASK_SIZE)
-+	{
- 		return copy_from_user(dst, src, size);
--	} else {
--		memcpy(dst, src, size);
-+	}
-+	else
-+	{
-+		memcpy( dst, src, size );
- 		return 0;
- 	}
- }
-@@ -222,7 +200,7 @@
- 	PAGELIST_T *pagelist;
- 	int ret;
- 
--	WARN_ON(memhandle != VCHI_MEM_HANDLE_INVALID);
-+	vcos_assert(memhandle == VCHI_MEM_HANDLE_INVALID);
- 
- 	ret = create_pagelist((char __user *)offset, size,
- 			(dir == VCHIQ_BULK_RECEIVE)
-@@ -246,8 +224,7 @@
- void
- vchiq_complete_bulk(VCHIQ_BULK_T *bulk)
- {
--	if (bulk && bulk->remote_data && bulk->actual)
--		free_pagelist((PAGELIST_T *)bulk->remote_data, bulk->actual);
-+	free_pagelist((PAGELIST_T *)bulk->remote_data, bulk->actual);
- }
- 
- void
-@@ -257,57 +234,83 @@
- 	 * This should only be called on the master (VideoCore) side, but
- 	 * provide an implementation to avoid the need for ifdefery.
- 	 */
--	BUG();
-+	vcos_assert(!"This code should not be called by the ARM on BCM2835");
- }
- 
- void
- vchiq_dump_platform_state(void *dump_context)
- {
--	char buf[80];
--	int len;
--	len = snprintf(buf, sizeof(buf),
--		"  Platform: 2835 (VC master)");
--	vchiq_dump(dump_context, buf, len + 1);
-+        char buf[80];
-+        int len;
-+        len = vcos_snprintf(buf, sizeof(buf),
-+                "  Platform: 2835 (VC master)");
-+        vchiq_dump(dump_context, buf, len + 1);
- }
- 
- VCHIQ_STATUS_T
- vchiq_platform_suspend(VCHIQ_STATE_T *state)
- {
-+   vcos_unused(state);
-+   vcos_assert_msg(0, "Suspend/resume not supported");
-    return VCHIQ_ERROR;
- }
- 
- VCHIQ_STATUS_T
- vchiq_platform_resume(VCHIQ_STATE_T *state)
- {
--   return VCHIQ_SUCCESS;
-+   vcos_unused(state);
-+   vcos_assert_msg(0, "Suspend/resume not supported");
-+   return VCHIQ_ERROR;
- }
- 
- void
- vchiq_platform_paused(VCHIQ_STATE_T *state)
- {
-+   vcos_unused(state);
-+   vcos_assert_msg(0, "Suspend/resume not supported");
- }
- 
- void
- vchiq_platform_resumed(VCHIQ_STATE_T *state)
- {
-+   vcos_unused(state);
-+   vcos_assert_msg(0, "Suspend/resume not supported");
- }
- 
- int
- vchiq_platform_videocore_wanted(VCHIQ_STATE_T* state)
- {
-+   vcos_unused(state);
-    return 1; // autosuspend not supported - videocore always wanted
- }
- 
-+#if VCOS_HAVE_TIMER
- int
- vchiq_platform_use_suspend_timer(void)
- {
-    return 0;
- }
-+#endif
- void
- vchiq_dump_platform_use_state(VCHIQ_STATE_T *state)
- {
--	vchiq_log_info((vchiq_arm_log_level>=VCHIQ_LOG_INFO),"Suspend timer not in use");
-+   vcos_unused(state);
- }
-+
-+VCHIQ_STATUS_T
-+vchiq_platform_init_state(VCHIQ_STATE_T *state)
-+{
-+   vcos_unused(state);
-+   return VCHIQ_SUCCESS;
-+}
-+
-+VCHIQ_ARM_STATE_T*
-+vchiq_platform_get_arm_state(VCHIQ_STATE_T *state)
-+{
-+   vcos_unused(state);
-+   return NULL;
-+}
-+
- /*
-  * Local functions
-  */
-@@ -315,7 +318,7 @@
- static irqreturn_t
- vchiq_doorbell_irq(int irq, void *dev_id)
- {
--	VCHIQ_STATE_T *state = dev_id;
-+   VCHIQ_STATE_T *state = dev_id;
- 	irqreturn_t ret = IRQ_NONE;
- 	unsigned int status;
- 
-@@ -331,17 +334,17 @@
- }
- 
- /* There is a potential problem with partial cache lines (pages?)
--** at the ends of the block when reading. If the CPU accessed anything in
--** the same line (page?) then it may have pulled old data into the cache,
--** obscuring the new data underneath. We can solve this by transferring the
--** partial cache lines separately, and allowing the ARM to copy into the
--** cached area.
--
--** N.B. This implementation plays slightly fast and loose with the Linux
--** driver programming rules, e.g. its use of __virt_to_bus instead of
--** dma_map_single, but it isn't a multi-platform driver and it benefits
--** from increased speed as a result.
--*/
-+	at the ends of the block when reading. If the CPU accessed anything in
-+	the same line (page?) then it may have pulled old data into the cache,
-+	obscuring the new data underneath. We can solve this by transferring the
-+	partial cache lines separately, and allowing the ARM to copy into the
-+	cached area.
-+
-+	N.B. This implementation plays slightly fast and loose with the Linux
-+	driver programming rules, e.g. its use of __virt_to_bus instead of
-+	dma_map_single, but it isn't a multi-platform driver and it benefits
-+	from increased speed as a result.
-+ */
- 
- static int
- create_pagelist(char __user *buf, size_t count, unsigned short type,
-@@ -360,16 +363,13 @@
- 
- 	*ppagelist = NULL;
- 
--	/* Allocate enough storage to hold the page pointers and the page
--	** list
--	*/
--	pagelist = kmalloc(sizeof(PAGELIST_T) +
-+	/* Allocate enough storage to hold the page pointers and the page list */
-+	pagelist = (PAGELIST_T *) kmalloc(sizeof(PAGELIST_T) +
- 		(num_pages * sizeof(unsigned long)) +
- 		(num_pages * sizeof(pages[0])),
- 		GFP_KERNEL);
- 
--	vchiq_log_trace(vchiq_arm_log_level,
--		"create_pagelist - %x", (unsigned int)pagelist);
-+	vcos_log_trace("create_pagelist - %x", (unsigned int)pagelist);
- 	if (!pagelist)
- 		return -ENOMEM;
- 
-@@ -380,22 +380,17 @@
- 	actual_pages = get_user_pages(task, task->mm,
- 		(unsigned long)buf & ~(PAGE_SIZE - 1), num_pages,
- 		(type == PAGELIST_READ) /*Write */ , 0 /*Force */ ,
--		pages, NULL /*vmas */);
-+		pages, NULL /*vmas */ );
- 	up_read(&task->mm->mmap_sem);
- 
--   if (actual_pages != num_pages)
--   {
--      /* This is probably due to the process being killed */
--      while (actual_pages > 0)
--      {
--         actual_pages--;
--         page_cache_release(pages[actual_pages]);
--      }
--      kfree(pagelist);
--      if (actual_pages == 0)
--         actual_pages = -ENOMEM;
--      return actual_pages;
--   }
-+        if (actual_pages != num_pages)
-+	{
-+		for (i = 0; i < actual_pages; i++) {
-+			page_cache_release(pages[i]);
-+		}
-+		kfree(pagelist);
-+		return -EINVAL;
-+	}
- 
- 	pagelist->length = count;
- 	pagelist->type = type;
-@@ -428,8 +423,7 @@
- 	/* Partial cache lines (fragments) require special measures */
- 	if ((type == PAGELIST_READ) &&
- 		((pagelist->offset & (CACHE_LINE_SIZE - 1)) ||
--		((pagelist->offset + pagelist->length) &
--		(CACHE_LINE_SIZE - 1)))) {
-+		((pagelist->offset + pagelist->length) & (CACHE_LINE_SIZE - 1)))) {
- 		FRAGMENTS_T *fragments;
- 
- 		if (down_interruptible(&g_free_fragments_sema) != 0) {
-@@ -437,11 +431,11 @@
- 			return -EINTR;
- 		}
- 
--		WARN_ON(g_free_fragments == NULL);
-+		vcos_assert(g_free_fragments != NULL);
- 
- 		down(&g_free_fragments_mutex);
- 		fragments = (FRAGMENTS_T *) g_free_fragments;
--		WARN_ON(fragments == NULL);
-+		vcos_assert(fragments != NULL);
- 		g_free_fragments = *(FRAGMENTS_T **) g_free_fragments;
- 		up(&g_free_fragments_mutex);
- 		pagelist->type =
-@@ -465,40 +459,39 @@
- 	struct page **pages;
- 	unsigned int num_pages, i;
- 
--	vchiq_log_trace(vchiq_arm_log_level,
--		"free_pagelist - %x, %d", (unsigned int)pagelist, actual);
-+	vcos_log_trace("free_pagelist - %x, %d", (unsigned int)pagelist, actual);
- 
- 	num_pages =
--		(pagelist->length + pagelist->offset + PAGE_SIZE - 1) /
--		PAGE_SIZE;
-+		 (pagelist->length + pagelist->offset + PAGE_SIZE - 1) / PAGE_SIZE;
- 
- 	pages = (struct page **)(pagelist->addrs + num_pages);
- 
- 	/* Deal with any partial cache lines (fragments) */
- 	if (pagelist->type >= PAGELIST_READ_WITH_FRAGMENTS) {
--		FRAGMENTS_T *fragments = g_fragments_base +
--			(pagelist->type - PAGELIST_READ_WITH_FRAGMENTS);
-+		FRAGMENTS_T *fragments =
-+			 g_fragments_base + (pagelist->type -
-+					PAGELIST_READ_WITH_FRAGMENTS);
- 		int head_bytes, tail_bytes;
--		head_bytes = (CACHE_LINE_SIZE - pagelist->offset) &
--			(CACHE_LINE_SIZE - 1);
--		tail_bytes = (pagelist->offset + actual) &
--			(CACHE_LINE_SIZE - 1);
--
--		if ((actual >= 0) && (head_bytes != 0)) {
--			if (head_bytes > actual)
--				head_bytes = actual;
--
--			memcpy((char *)page_address(pages[0]) +
--				pagelist->offset,
--				fragments->headbuf,
--				head_bytes);
--		}
--		if ((actual >= 0) && (head_bytes < actual) &&
--			(tail_bytes != 0)) {
--			memcpy((char *)page_address(pages[num_pages - 1]) +
--				((pagelist->offset + actual) &
--				(PAGE_SIZE - 1) & ~(CACHE_LINE_SIZE - 1)),
--				fragments->tailbuf, tail_bytes);
-+
-+		if (actual >= 0)
-+		{
-+			if ((head_bytes = (CACHE_LINE_SIZE - pagelist->offset) & (CACHE_LINE_SIZE - 1)) != 0) {
-+				if (head_bytes > actual)
-+					head_bytes = actual;
-+
-+				memcpy((char *)page_address(pages[0]) +
-+						 pagelist->offset, fragments->headbuf,
-+						 head_bytes);
-+			}
-+			if ((head_bytes < actual) &&
-+				(tail_bytes =
-+				(pagelist->offset + actual) & (CACHE_LINE_SIZE -
-+										1)) != 0) {
-+				memcpy((char *)page_address(pages[num_pages - 1]) +
-+						 ((pagelist->offset + actual) & (PAGE_SIZE -
-+									1) & ~(CACHE_LINE_SIZE - 1)),
-+						 fragments->tailbuf, tail_bytes);
-+			}
- 		}
- 
- 		down(&g_free_fragments_mutex);
-@@ -516,3 +509,4 @@
- 
- 	kfree(pagelist);
- }
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c	2012-10-21 15:15:10.007259869 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c	2012-10-17 18:57:47.000000000 +0200
-@@ -26,10 +26,6 @@
- #include <linux/mm.h>
- #include <linux/highmem.h>
- #include <linux/pagemap.h>
--#include <linux/bug.h>
--#include <linux/semaphore.h>
--#include <linux/list.h>
--#include <linux/proc_fs.h>
- 
- #include "vchiq_core.h"
- #include "vchiq_ioctl.h"
-@@ -49,128 +45,139 @@
- #define MAX_ELEMENTS 8
- #define MSG_QUEUE_SIZE 64
- 
--#define KEEPALIVE_VER 1
--#define KEEPALIVE_VER_MIN KEEPALIVE_VER
-+#define VCOS_LOG_CATEGORY (&vchiq_arm_log_category)
- 
--/* Run time control of log level, based on KERN_XXX level. */
--int vchiq_arm_log_level = VCHIQ_LOG_DEFAULT;
--int vchiq_susp_log_level = VCHIQ_LOG_DEFAULT;
-+#define VCHIQ_ARM_VCSUSPEND_TASK_STACK 4096
- 
-+#if VCOS_HAVE_TIMER
- #define SUSPEND_TIMER_TIMEOUT_MS 100
--#define SUSPEND_RETRY_TIMER_TIMEOUT_MS 1000
--
--#define VC_SUSPEND_NUM_OFFSET 3 /* number of values before idle which are -ve */
--static const char *const suspend_state_names[] = {
--	"VC_SUSPEND_FORCE_CANCELED",
--	"VC_SUSPEND_REJECTED",
--	"VC_SUSPEND_FAILED",
--	"VC_SUSPEND_IDLE",
--	"VC_SUSPEND_REQUESTED",
--	"VC_SUSPEND_IN_PROGRESS",
--	"VC_SUSPEND_SUSPENDED"
--};
--#define VC_RESUME_NUM_OFFSET 1 /* number of values before idle which are -ve */
--static const char *const resume_state_names[] = {
--	"VC_RESUME_FAILED",
--	"VC_RESUME_IDLE",
--	"VC_RESUME_REQUESTED",
--	"VC_RESUME_IN_PROGRESS",
--	"VC_RESUME_RESUMED"
--};
--/* The number of times we allow force suspend to timeout before actually
--** _forcing_ suspend.  This is to cater for SW which fails to release vchiq
--** correctly - we don't want to prevent ARM suspend indefinitely in this case.
--*/
--#define FORCE_SUSPEND_FAIL_MAX 8
--
--/* The time in ms allowed for videocore to go idle when force suspend has been
-- * requested */
--#define FORCE_SUSPEND_TIMEOUT_MS 200
--
--
--static void suspend_timer_callback(unsigned long context);
--static int vchiq_proc_add_instance(VCHIQ_INSTANCE_T instance);
--static void vchiq_proc_remove_instance(VCHIQ_INSTANCE_T instance);
--
--
--typedef struct user_service_struct {
--	VCHIQ_SERVICE_T *service;
--	void *userdata;
--	VCHIQ_INSTANCE_T instance;
--	int is_vchi;
--	int dequeue_pending;
--	int message_available_pos;
--	int msg_insert;
--	int msg_remove;
--	struct semaphore insert_event;
--	struct semaphore remove_event;
--	VCHIQ_HEADER_T * msg_queue[MSG_QUEUE_SIZE];
-+static VCOS_TIMER_T      g_suspend_timer;
-+static void suspend_timer_callback(void *context);
-+#endif
-+
-+
-+typedef struct client_service_struct {
-+   VCHIQ_SERVICE_T *service;
-+   void *userdata;
-+   VCHIQ_INSTANCE_T instance;
-+   int handle;
-+   int is_vchi;
-+   volatile int dequeue_pending;
-+   volatile int message_available_pos;
-+   volatile int msg_insert;
-+   volatile int msg_remove;
-+   VCOS_EVENT_T insert_event;
-+   VCOS_EVENT_T remove_event;
-+   VCHIQ_HEADER_T *msg_queue[MSG_QUEUE_SIZE];
- } USER_SERVICE_T;
- 
--struct bulk_waiter_node {
--	struct bulk_waiter bulk_waiter;
--	int pid;
--	struct list_head list;
--};
--
- struct vchiq_instance_struct {
--	VCHIQ_STATE_T *state;
--	VCHIQ_COMPLETION_DATA_T completions[MAX_COMPLETIONS];
--	int completion_insert;
--	int completion_remove;
--	struct semaphore insert_event;
--	struct semaphore remove_event;
--	struct mutex completion_mutex;
--
--	int connected;
--	int closing;
--	int pid;
--	int mark;
--
--	struct list_head bulk_waiter_list;
--	struct mutex bulk_waiter_list_mutex;
--
--	struct proc_dir_entry *proc_entry;
-+   VCHIQ_STATE_T *state;
-+   VCHIQ_COMPLETION_DATA_T completions[MAX_COMPLETIONS];
-+   volatile int completion_insert;
-+   volatile int completion_remove;
-+   VCOS_EVENT_T insert_event;
-+   VCOS_EVENT_T remove_event;
-+
-+   USER_SERVICE_T services[MAX_SERVICES];
-+
-+   int connected;
-+   int closing;
-+   int pid;
-+   int mark;
- };
- 
--typedef struct dump_context_struct {
--	char __user *buf;
--	size_t actual;
--	size_t space;
--	loff_t offset;
-+typedef struct dump_context_struct
-+{
-+   char __user *buf;
-+   size_t actual;
-+   size_t space;
-+   loff_t offset;
- } DUMP_CONTEXT_T;
- 
-+VCOS_LOG_CAT_T vchiq_arm_log_category;
-+
- static struct cdev    vchiq_cdev;
- static dev_t          vchiq_devid;
- static VCHIQ_STATE_T g_state;
- static struct class  *vchiq_class;
- static struct device *vchiq_dev;
--static DEFINE_SPINLOCK(msg_queue_spinlock);
- 
--static const char *const ioctl_names[] = {
--	"CONNECT",
--	"SHUTDOWN",
--	"CREATE_SERVICE",
--	"REMOVE_SERVICE",
--	"QUEUE_MESSAGE",
--	"QUEUE_BULK_TRANSMIT",
--	"QUEUE_BULK_RECEIVE",
--	"AWAIT_COMPLETION",
--	"DEQUEUE_MESSAGE",
--	"GET_CLIENT_ID",
--	"GET_CONFIG",
--	"CLOSE_SERVICE",
--	"USE_SERVICE",
--	"RELEASE_SERVICE",
--	"SET_SERVICE_OPTION",
--	"DUMP_PHYS_MEM"
-+static const char *ioctl_names[] =
-+{
-+   "CONNECT",
-+   "SHUTDOWN",
-+   "CREATE_SERVICE",
-+   "REMOVE_SERVICE",
-+   "QUEUE_MESSAGE",
-+   "QUEUE_BULK_TRANSMIT",
-+   "QUEUE_BULK_RECEIVE",
-+   "AWAIT_COMPLETION",
-+   "DEQUEUE_MESSAGE",
-+   "GET_CLIENT_ID",
-+   "GET_CONFIG",
-+   "CLOSE_SERVICE",
-+   "USE_SERVICE",
-+   "RELEASE_SERVICE",
-+   "SET_SERVICE_OPTION",
-+   "DUMP_PHYS_MEM"
- };
- 
--vchiq_static_assert((sizeof(ioctl_names)/sizeof(ioctl_names[0])) ==
--	(VCHIQ_IOC_MAX + 1));
-+vcos_static_assert(vcos_countof(ioctl_names) == (VCHIQ_IOC_MAX + 1));
-+
-+VCOS_LOG_LEVEL_T vchiq_default_arm_log_level = VCOS_LOG_ERROR;
- 
- static void
--dump_phys_mem(void *virt_addr, uint32_t num_bytes);
-+dump_phys_mem( void *virt_addr, uint32_t num_bytes );
-+
-+/****************************************************************************
-+*
-+*   find_service_by_handle
-+*
-+***************************************************************************/
-+
-+static inline USER_SERVICE_T *find_service_by_handle(
-+   VCHIQ_INSTANCE_T instance, int handle )
-+{
-+   USER_SERVICE_T *user_service;
-+
-+   if (( handle >= 0 )
-+      && ( handle < MAX_SERVICES ))
-+   {
-+      user_service = &instance->services[ handle ];
-+
-+      if ( user_service->service != NULL )
-+      {
-+         return user_service;
-+      }
-+   }
-+
-+   return NULL;
-+}
-+
-+/****************************************************************************
-+*
-+*   find_avail_service_handle
-+*
-+***************************************************************************/
-+
-+static inline USER_SERVICE_T *find_avail_service_handle(
-+   VCHIQ_INSTANCE_T instance)
-+{
-+   int handle;
-+
-+   for ( handle = 0; handle < MAX_SERVICES; handle++ )
-+   {
-+      if ( instance->services[handle].service == NULL )
-+      {
-+         instance->services[handle].instance = instance;
-+         instance->services[handle].handle = handle;
-+
-+         return &instance->services[handle];
-+      }
-+   }
-+   return NULL;
-+}
- 
- /****************************************************************************
- *
-@@ -180,58 +187,47 @@
- 
- static VCHIQ_STATUS_T
- add_completion(VCHIQ_INSTANCE_T instance, VCHIQ_REASON_T reason,
--	VCHIQ_HEADER_T *header, USER_SERVICE_T *user_service,
--	void *bulk_userdata)
-+   VCHIQ_HEADER_T *header, USER_SERVICE_T *service, void *bulk_userdata)
- {
--	VCHIQ_COMPLETION_DATA_T *completion;
--	DEBUG_INITIALISE(g_state.local)
-+   VCHIQ_COMPLETION_DATA_T *completion;
-+   DEBUG_INITIALISE(g_state.local)
- 
--	while (instance->completion_insert ==
--		(instance->completion_remove + MAX_COMPLETIONS)) {
--		/* Out of space - wait for the client */
--		DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--		vchiq_log_trace(vchiq_arm_log_level,
--			"add_completion - completion queue full");
--		DEBUG_COUNT(COMPLETION_QUEUE_FULL_COUNT);
--		if (down_interruptible(&instance->remove_event) != 0) {
--			vchiq_log_info(vchiq_arm_log_level,
--				"service_callback interrupted");
--			return VCHIQ_RETRY;
--		} else if (instance->closing) {
--			vchiq_log_info(vchiq_arm_log_level,
--				"service_callback closing");
--			return VCHIQ_ERROR;
--		}
--		DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--	}
--
--	completion =
--		 &instance->completions[instance->completion_insert &
--		 (MAX_COMPLETIONS - 1)];
--
--	completion->header = header;
--	completion->reason = reason;
--	/* N.B. service_userdata is updated while processing AWAIT_COMPLETION */
--	completion->service_userdata = user_service->service;
--	completion->bulk_userdata = bulk_userdata;
--
--	if (reason == VCHIQ_SERVICE_CLOSED)
--		/* Take an extra reference, to be held until
--		   this CLOSED notification is delivered. */
--		lock_service(user_service->service);
--
--	/* A write barrier is needed here to ensure that the entire completion
--		record is written out before the insert point. */
--	wmb();
--
--	if (reason == VCHIQ_MESSAGE_AVAILABLE)
--		user_service->message_available_pos =
--			instance->completion_insert;
--	instance->completion_insert++;
-+   while (instance->completion_insert ==
-+          (instance->completion_remove + MAX_COMPLETIONS)) {
-+      /* Out of space - wait for the client */
-+      DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+      vcos_log_trace("add_completion - completion queue full");
-+      DEBUG_COUNT(COMPLETION_QUEUE_FULL_COUNT);
-+      if (vcos_event_wait(&instance->remove_event) != VCOS_SUCCESS) {
-+         vcos_log_info("service_callback interrupted");
-+         return VCHIQ_RETRY;
-+      } else if (instance->closing) {
-+         vcos_log_info("service_callback closing");
-+         return VCHIQ_ERROR;
-+      }
-+      DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+   }
-+
-+   completion =
-+       &instance->
-+       completions[instance->completion_insert & (MAX_COMPLETIONS - 1)];
-+
-+   completion->header = header;
-+   completion->reason = reason;
-+   completion->service_userdata = service;
-+   completion->bulk_userdata = bulk_userdata;
-+
-+   /* A write barrier is needed here to ensure that the entire completion
-+      record is written out before the insert point. */
-+   vcos_wmb(&completion->bulk_userdata);
-+
-+   if (reason == VCHIQ_MESSAGE_AVAILABLE)
-+      service->message_available_pos = instance->completion_insert;
-+   instance->completion_insert++;
- 
--	up(&instance->insert_event);
-+   vcos_event_signal(&instance->insert_event);
- 
--	return VCHIQ_SUCCESS;
-+   return VCHIQ_SUCCESS;
- }
- 
- /****************************************************************************
-@@ -242,104 +238,90 @@
- 
- static VCHIQ_STATUS_T
- service_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header,
--	VCHIQ_SERVICE_HANDLE_T handle, void *bulk_userdata)
-+   VCHIQ_SERVICE_HANDLE_T handle, void *bulk_userdata)
- {
--	/* How do we ensure the callback goes to the right client?
--	** The service_user data points to a USER_SERVICE_T record containing
--	** the original callback and the user state structure, which contains a
--	** circular buffer for completion records.
--	*/
--	USER_SERVICE_T *user_service;
--	VCHIQ_SERVICE_T *service;
--	VCHIQ_INSTANCE_T instance;
--	DEBUG_INITIALISE(g_state.local)
--
--	DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--
--	service = handle_to_service(handle);
--	BUG_ON(!service);
--	user_service = (USER_SERVICE_T *)service->base.userdata;
--	instance = user_service->instance;
--
--	if (!instance || instance->closing)
--		return VCHIQ_SUCCESS;
--
--	vchiq_log_trace(vchiq_arm_log_level,
--		"service_callback - service %lx(%d), reason %d, header %lx, "
--		"instance %lx, bulk_userdata %lx",
--		(unsigned long)user_service,
--		service->localport,
--		reason, (unsigned long)header,
--		(unsigned long)instance, (unsigned long)bulk_userdata);
--
--	if (header && user_service->is_vchi) {
--		spin_lock(&msg_queue_spinlock);
--		while (user_service->msg_insert ==
--			(user_service->msg_remove + MSG_QUEUE_SIZE)) {
--			spin_unlock(&msg_queue_spinlock);
--			DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--			DEBUG_COUNT(MSG_QUEUE_FULL_COUNT);
--			vchiq_log_trace(vchiq_arm_log_level,
--				"service_callback - msg queue full");
--			/* If there is no MESSAGE_AVAILABLE in the completion
--			** queue, add one
--			*/
--			if ((user_service->message_available_pos -
--				instance->completion_remove) < 0) {
--				VCHIQ_STATUS_T status;
--				vchiq_log_info(vchiq_arm_log_level,
--					"Inserting extra MESSAGE_AVAILABLE");
--				DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--				status = add_completion(instance, reason,
--					NULL, user_service, bulk_userdata);
--				if (status != VCHIQ_SUCCESS) {
--					DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--					return status;
--				}
--			}
--
--			DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--			if (down_interruptible(&user_service->remove_event)
--				!= 0) {
--				vchiq_log_info(vchiq_arm_log_level,
--					"service_callback interrupted");
--				DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--				return VCHIQ_RETRY;
--			} else if (instance->closing) {
--				vchiq_log_info(vchiq_arm_log_level,
--					"service_callback closing");
--				DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--				return VCHIQ_ERROR;
--			}
--			DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--			spin_lock(&msg_queue_spinlock);
--		}
--
--		user_service->msg_queue[user_service->msg_insert &
--			(MSG_QUEUE_SIZE - 1)] = header;
--		user_service->msg_insert++;
--		spin_unlock(&msg_queue_spinlock);
--
--		up(&user_service->insert_event);
--
--		/* If there is a thread waiting in DEQUEUE_MESSAGE, or if
--		** there is a MESSAGE_AVAILABLE in the completion queue then
--		** bypass the completion queue.
--		*/
--		if (((user_service->message_available_pos -
--			instance->completion_remove) >= 0) ||
--			user_service->dequeue_pending) {
--			DEBUG_TRACE(SERVICE_CALLBACK_LINE);
--			user_service->dequeue_pending = 0;
--			return VCHIQ_SUCCESS;
--		}
--
--		header = NULL;
--	}
--	DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+   /* How do we ensure the callback goes to the right client?
-+      The service_user data points to a USER_SERVICE_T record containing the
-+      original callback and the user state structure, which contains a circular
-+      buffer for completion records.
-+    */
-+   USER_SERVICE_T *service =
-+       (USER_SERVICE_T *) VCHIQ_GET_SERVICE_USERDATA(handle);
-+   VCHIQ_INSTANCE_T instance = service->instance;
-+   DEBUG_INITIALISE(g_state.local)
-+
-+   DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+   vcos_log_trace
-+       ("service_callback - service %lx(%d), reason %d, header %lx, "
-+        "instance %lx, bulk_userdata %lx",
-+        (unsigned long)service, ((VCHIQ_SERVICE_T *) handle)->localport,
-+        reason, (unsigned long)header,
-+        (unsigned long)instance, (unsigned long)bulk_userdata);
-+
-+   if (!instance || instance->closing) {
-+      return VCHIQ_SUCCESS;
-+   }
-+
-+   if (header && service->is_vchi)
-+   {
-+      while (service->msg_insert == (service->msg_remove + MSG_QUEUE_SIZE))
-+      {
-+         DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+         DEBUG_COUNT(MSG_QUEUE_FULL_COUNT);
-+         vcos_log_trace("service_callback - msg queue full");
-+         /* If there is no MESSAGE_AVAILABLE in the completion queue, add one */
-+         if ((service->message_available_pos - instance->completion_remove) < 0)
-+         {
-+            VCHIQ_STATUS_T status;
-+            vcos_log_warn("Inserting extra MESSAGE_AVAILABLE");
-+            DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+            status = add_completion(instance, reason, NULL, service, bulk_userdata);
-+            if (status != VCHIQ_SUCCESS)
-+            {
-+               DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+               return status;
-+            }
-+         }
-+         
-+         DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+         if (vcos_event_wait(&service->remove_event) != VCOS_SUCCESS) {
-+            vcos_log_info("service_callback interrupted");
-+            DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+            return VCHIQ_RETRY;
-+         } else if (instance->closing) {
-+            vcos_log_info("service_callback closing");
-+            DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+            return VCHIQ_ERROR;
-+         }
-+         DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+      }
-+
-+      service->msg_queue[service->msg_insert & (MSG_QUEUE_SIZE - 1)] =
-+         header;
-+
-+      /* A write memory barrier is needed to ensure that the store of header
-+         is completed before the insertion point is updated */
-+      vcos_wmb(&service->msg_queue[service->msg_insert & (MSG_QUEUE_SIZE - 1)]);
-+
-+      service->msg_insert++;
-+      vcos_event_signal(&service->insert_event);
-+
-+      /* If there is a thread waiting in DEQUEUE_MESSAGE, or if
-+         there is a MESSAGE_AVAILABLE in the completion queue then
-+         bypass the completion queue. */
-+      if (((service->message_available_pos - instance->completion_remove) >= 0) ||
-+          service->dequeue_pending)
-+      {
-+         DEBUG_TRACE(SERVICE_CALLBACK_LINE);
-+         service->dequeue_pending = 0;
-+         return VCHIQ_SUCCESS;
-+      }
-+
-+      header = NULL;
-+   }
-+   DEBUG_TRACE(SERVICE_CALLBACK_LINE);
- 
--	return add_completion(instance, reason, header, user_service,
--		bulk_userdata);
-+   return add_completion(instance, reason, header, service, bulk_userdata);
- }
- 
- /****************************************************************************
-@@ -351,649 +333,603 @@
- static long
- vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- {
--	VCHIQ_INSTANCE_T instance = file->private_data;
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
--	VCHIQ_SERVICE_T *service = NULL;
--	long ret = 0;
--	int i, rc;
--	DEBUG_INITIALISE(g_state.local)
--
--	vchiq_log_trace(vchiq_arm_log_level,
--		 "vchiq_ioctl - instance %x, cmd %s, arg %lx",
--		(unsigned int)instance,
--		((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) &&
--		(_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ?
--		ioctl_names[_IOC_NR(cmd)] : "<invalid>", arg);
--
--	switch (cmd) {
--	case VCHIQ_IOC_SHUTDOWN:
--		if (!instance->connected)
--			break;
--
--		/* Remove all services */
--		i = 0;
--		while ((service = next_service_by_instance(instance->state,
--			instance, &i)) != NULL) {
--			status = vchiq_remove_service(service->handle);
--			unlock_service(service);
--			if (status != VCHIQ_SUCCESS)
--				break;
--		}
--		service = NULL;
--
--		if (status == VCHIQ_SUCCESS) {
--			/* Wake the completion thread and ask it to exit */
--			instance->closing = 1;
--			up(&instance->insert_event);
--		}
--
--		break;
--
--	case VCHIQ_IOC_CONNECT:
--		if (instance->connected) {
--			ret = -EINVAL;
--			break;
--		}
--		rc = mutex_lock_interruptible(&instance->state->mutex);
--		if (rc != 0) {
--			vchiq_log_error(vchiq_arm_log_level,
--				"vchiq: connect: could not lock mutex for "
--				"state %d: %d",
--				instance->state->id, rc);
--			ret = -EINTR;
--			break;
--		}
--		status = vchiq_connect_internal(instance->state, instance);
--		mutex_unlock(&instance->state->mutex);
--
--		if (status == VCHIQ_SUCCESS)
--			instance->connected = 1;
--		else
--			vchiq_log_error(vchiq_arm_log_level,
--				"vchiq: could not connect: %d", status);
--		break;
--
--	case VCHIQ_IOC_CREATE_SERVICE: {
--		VCHIQ_CREATE_SERVICE_T args;
--		USER_SERVICE_T *user_service = NULL;
--		void *userdata;
--		int srvstate;
--
--		if (copy_from_user
--			 (&args, (const void __user *)arg,
--			  sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--
--		user_service = kmalloc(sizeof(USER_SERVICE_T), GFP_KERNEL);
--		if (!user_service) {
--			ret = -ENOMEM;
--			break;
--		}
--
--		if (args.is_open) {
--			if (!instance->connected) {
--				ret = -ENOTCONN;
--				break;
--			}
--			srvstate = VCHIQ_SRVSTATE_OPENING;
--		} else {
--			srvstate =
--				 instance->connected ?
--				 VCHIQ_SRVSTATE_LISTENING :
--				 VCHIQ_SRVSTATE_HIDDEN;
--		}
--
--		userdata = args.params.userdata;
--		args.params.callback = service_callback;
--		args.params.userdata = user_service;
--		service = vchiq_add_service_internal(
--				instance->state,
--				&args.params, srvstate,
--				instance);
--
--		if (service != NULL) {
--			user_service->service = service;
--			user_service->userdata = userdata;
--			user_service->instance = instance;
--			user_service->is_vchi = args.is_vchi;
--			user_service->dequeue_pending = 0;
--			user_service->message_available_pos =
--				instance->completion_remove - 1;
--			user_service->msg_insert = 0;
--			user_service->msg_remove = 0;
--			sema_init(&user_service->insert_event, 0);
--			sema_init(&user_service->remove_event, 0);
--
--			if (args.is_open) {
--				status = vchiq_open_service_internal
--					(service, instance->pid);
--				if (status != VCHIQ_SUCCESS) {
--					vchiq_remove_service(service->handle);
--					service = NULL;
--					ret = (status == VCHIQ_RETRY) ?
--						-EINTR : -EIO;
--					user_service->service = NULL;
--					user_service->instance = NULL;
--					break;
--				}
--			}
--
--			if (copy_to_user((void __user *)
--				&(((VCHIQ_CREATE_SERVICE_T __user *)
--					arg)->handle),
--				(const void *)&service->handle,
--				sizeof(service->handle)) != 0) {
--				ret = -EFAULT;
--				vchiq_remove_service(service->handle);
--				kfree(user_service);
--			}
--
--			service = NULL;
--		} else {
--			ret = -EEXIST;
--			kfree(user_service);
--		}
--	} break;
--
--	case VCHIQ_IOC_CLOSE_SERVICE: {
--		VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
--
--		service = find_service_for_instance(instance, handle);
--		if (service != NULL)
--			status = vchiq_close_service(service->handle);
--		else
--			ret = -EINVAL;
--	} break;
--
--	case VCHIQ_IOC_REMOVE_SERVICE: {
--		VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
--
--		service = find_service_for_instance(instance, handle);
--		if (service != NULL)
--			status = vchiq_remove_service(service->handle);
--		else
--			ret = -EINVAL;
--	} break;
--
--	case VCHIQ_IOC_USE_SERVICE:
--	case VCHIQ_IOC_RELEASE_SERVICE:	{
--		VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
--
--		service = find_service_for_instance(instance, handle);
--		if (service != NULL) {
--			status = (cmd == VCHIQ_IOC_USE_SERVICE)	?
--				vchiq_use_service_internal(service) :
--				vchiq_release_service_internal(service);
--			if (status != VCHIQ_SUCCESS) {
--				vchiq_log_error(vchiq_susp_log_level,
--					"%s: cmd %s returned error %d for "
--					"service %c%c%c%c:%03d",
--					__func__,
--					(cmd == VCHIQ_IOC_USE_SERVICE) ?
--						"VCHIQ_IOC_USE_SERVICE" :
--						"VCHIQ_IOC_RELEASE_SERVICE",
--					status,
--					VCHIQ_FOURCC_AS_4CHARS(
--						service->base.fourcc),
--					service->client_id);
--				ret = -EINVAL;
--			}
--		} else
--			ret = -EINVAL;
--	} break;
--
--	case VCHIQ_IOC_QUEUE_MESSAGE: {
--		VCHIQ_QUEUE_MESSAGE_T args;
--		if (copy_from_user
--			 (&args, (const void __user *)arg,
--			  sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--
--		service = find_service_for_instance(instance, args.handle);
--
--		if ((service != NULL) && (args.count <= MAX_ELEMENTS)) {
--			/* Copy elements into kernel space */
--			VCHIQ_ELEMENT_T elements[MAX_ELEMENTS];
--			if (copy_from_user(elements, args.elements,
--				args.count * sizeof(VCHIQ_ELEMENT_T)) == 0)
--				status = vchiq_queue_message
--					(args.handle,
--					elements, args.count);
--			else
--				ret = -EFAULT;
--		} else {
--			ret = -EINVAL;
--		}
--	} break;
--
--	case VCHIQ_IOC_QUEUE_BULK_TRANSMIT:
--	case VCHIQ_IOC_QUEUE_BULK_RECEIVE: {
--		VCHIQ_QUEUE_BULK_TRANSFER_T args;
--		struct bulk_waiter_node *waiter = NULL;
--		VCHIQ_BULK_DIR_T dir =
--			(cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ?
--			VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;
--
--		if (copy_from_user
--			(&args, (const void __user *)arg,
--			sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--
--		service = find_service_for_instance(instance, args.handle);
--		if (!service) {
--			ret = -EINVAL;
--			break;
--		}
--
--		if (args.mode == VCHIQ_BULK_MODE_BLOCKING) {
--			waiter = kzalloc(sizeof(struct bulk_waiter_node),
--				GFP_KERNEL);
--			if (!waiter) {
--				ret = -ENOMEM;
--				break;
--			}
--			args.userdata = &waiter->bulk_waiter;
--		} else if (args.mode == VCHIQ_BULK_MODE_WAITING) {
--			struct list_head *pos;
--			mutex_lock(&instance->bulk_waiter_list_mutex);
--			list_for_each(pos, &instance->bulk_waiter_list) {
--				if (list_entry(pos, struct bulk_waiter_node,
--					list)->pid == current->pid) {
--					waiter = list_entry(pos,
--						struct bulk_waiter_node,
--						list);
--					list_del(pos);
--					break;
--				}
--
--			}
--			mutex_unlock(&instance->bulk_waiter_list_mutex);
--			if (!waiter) {
--				vchiq_log_error(vchiq_arm_log_level,
--					"no bulk_waiter found for pid %d",
--					current->pid);
--				ret = -ESRCH;
--				break;
--			}
--			vchiq_log_info(vchiq_arm_log_level,
--				"found bulk_waiter %x for pid %d",
--				(unsigned int)waiter, current->pid);
--			args.userdata = &waiter->bulk_waiter;
--		}
--		status = vchiq_bulk_transfer
--			(args.handle,
--			 VCHI_MEM_HANDLE_INVALID,
--			 args.data, args.size,
--			 args.userdata, args.mode,
--			 dir);
--		if (!waiter)
--			break;
--		if ((status != VCHIQ_RETRY) || fatal_signal_pending(current) ||
--			!waiter->bulk_waiter.bulk) {
--			if (waiter->bulk_waiter.bulk) {
--				/* Cancel the signal when the transfer
--				** completes. */
--				spin_lock(&bulk_waiter_spinlock);
--				waiter->bulk_waiter.bulk->userdata = NULL;
--				spin_unlock(&bulk_waiter_spinlock);
--			}
--			kfree(waiter);
--		} else {
--			const VCHIQ_BULK_MODE_T mode_waiting =
--				VCHIQ_BULK_MODE_WAITING;
--			waiter->pid = current->pid;
--			mutex_lock(&instance->bulk_waiter_list_mutex);
--			list_add(&waiter->list, &instance->bulk_waiter_list);
--			mutex_unlock(&instance->bulk_waiter_list_mutex);
--			vchiq_log_info(vchiq_arm_log_level,
--				"saved bulk_waiter %x for pid %d",
--				(unsigned int)waiter, current->pid);
--
--			if (copy_to_user((void __user *)
--				&(((VCHIQ_QUEUE_BULK_TRANSFER_T __user *)
--					arg)->mode),
--				(const void *)&mode_waiting,
--				sizeof(mode_waiting)) != 0)
--				ret = -EFAULT;
--		}
--	} break;
--
--	case VCHIQ_IOC_AWAIT_COMPLETION: {
--		VCHIQ_AWAIT_COMPLETION_T args;
--
--		DEBUG_TRACE(AWAIT_COMPLETION_LINE);
--		if (!instance->connected) {
--			ret = -ENOTCONN;
--			break;
--		}
--
--		if (copy_from_user(&args, (const void __user *)arg,
--			sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--
--		mutex_lock(&instance->completion_mutex);
--
--		DEBUG_TRACE(AWAIT_COMPLETION_LINE);
--		while ((instance->completion_remove ==
--			instance->completion_insert)
--			&& !instance->closing) {
--			int rc;
--			DEBUG_TRACE(AWAIT_COMPLETION_LINE);
--			mutex_unlock(&instance->completion_mutex);
--			rc = down_interruptible(&instance->insert_event);
--			mutex_lock(&instance->completion_mutex);
--			if (rc != 0) {
--				DEBUG_TRACE(AWAIT_COMPLETION_LINE);
--				vchiq_log_info(vchiq_arm_log_level,
--					"AWAIT_COMPLETION interrupted");
--				ret = -EINTR;
--				break;
--			}
--		}
--		DEBUG_TRACE(AWAIT_COMPLETION_LINE);
--
--		/* A read memory barrier is needed to stop prefetch of a stale
--		** completion record
--		*/
--		rmb();
--
--		if ((ret == 0) && !instance->closing) {
--			int msgbufcount = args.msgbufcount;
--			for (ret = 0; ret < args.count; ret++) {
--				VCHIQ_COMPLETION_DATA_T *completion;
--				VCHIQ_SERVICE_T *service;
--				USER_SERVICE_T *user_service;
--				VCHIQ_HEADER_T *header;
--				if (instance->completion_remove ==
--					instance->completion_insert)
--					break;
--				completion = &instance->completions[
--					instance->completion_remove &
--					(MAX_COMPLETIONS - 1)];
--
--				service = completion->service_userdata;
--				user_service = service->base.userdata;
--				completion->service_userdata =
--					user_service->userdata;
--
--				header = completion->header;
--				if (header) {
--					void __user *msgbuf;
--					int msglen;
--
--					msglen = header->size +
--						sizeof(VCHIQ_HEADER_T);
--					/* This must be a VCHIQ-style service */
--					if (args.msgbufsize < msglen) {
--						vchiq_log_error(
--							vchiq_arm_log_level,
--							"header %x: msgbufsize"
--							" %x < msglen %x",
--							(unsigned int)header,
--							args.msgbufsize,
--							msglen);
--						WARN(1, "invalid message "
--							"size\n");
--						if (ret == 0)
--							ret = -EMSGSIZE;
--						break;
--					}
--					if (msgbufcount <= 0)
--						/* Stall here for lack of a
--						** buffer for the message. */
--						break;
--					/* Get the pointer from user space */
--					msgbufcount--;
--					if (copy_from_user(&msgbuf,
--						(const void __user *)
--						&args.msgbufs[msgbufcount],
--						sizeof(msgbuf)) != 0) {
--						if (ret == 0)
--							ret = -EFAULT;
--						break;
--					}
--
--					/* Copy the message to user space */
--					if (copy_to_user(msgbuf, header,
--						msglen) != 0) {
--						if (ret == 0)
--							ret = -EFAULT;
--						break;
--					}
--
--					/* Now it has been copied, the message
--					** can be released. */
--					vchiq_release_message(service->handle,
--						header);
--
--					/* The completion must point to the
--					** msgbuf. */
--					completion->header = msgbuf;
--				}
--
--				if (completion->reason ==
--					VCHIQ_SERVICE_CLOSED) {
--					unlock_service(service);
--					kfree(user_service);
--				}
--
--				if (copy_to_user((void __user *)(
--					(size_t)args.buf +
--					ret * sizeof(VCHIQ_COMPLETION_DATA_T)),
--					completion,
--					sizeof(VCHIQ_COMPLETION_DATA_T)) != 0) {
--						if (ret == 0)
--							ret = -EFAULT;
--					break;
--				}
--
--				instance->completion_remove++;
--			}
--
--			if (msgbufcount != args.msgbufcount) {
--				if (copy_to_user((void __user *)
--					&((VCHIQ_AWAIT_COMPLETION_T *)arg)->
--						msgbufcount,
--					&msgbufcount,
--					sizeof(msgbufcount)) != 0) {
--					ret = -EFAULT;
--				}
--			}
--		}
--
--		if (ret != 0)
--			up(&instance->remove_event);
--		mutex_unlock(&instance->completion_mutex);
--		DEBUG_TRACE(AWAIT_COMPLETION_LINE);
--	} break;
--
--	case VCHIQ_IOC_DEQUEUE_MESSAGE: {
--		VCHIQ_DEQUEUE_MESSAGE_T args;
--		USER_SERVICE_T *user_service;
--		VCHIQ_HEADER_T *header;
--
--		DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
--		if (copy_from_user
--			 (&args, (const void __user *)arg,
--			  sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--		service = find_service_for_instance(instance, args.handle);
--		if (!service) {
--			ret = -EINVAL;
--			break;
--		}
--		user_service = (USER_SERVICE_T *)service->base.userdata;
--		if (user_service->is_vchi == 0) {
--			ret = -EINVAL;
--			break;
--		}
--
--		spin_lock(&msg_queue_spinlock);
--		if (user_service->msg_remove == user_service->msg_insert) {
--			if (!args.blocking) {
--				spin_unlock(&msg_queue_spinlock);
--				DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
--				ret = -EWOULDBLOCK;
--				break;
--			}
--			user_service->dequeue_pending = 1;
--			do {
--				spin_unlock(&msg_queue_spinlock);
--				DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
--				if (down_interruptible(
--					&user_service->insert_event) != 0) {
--					vchiq_log_info(vchiq_arm_log_level,
--						"DEQUEUE_MESSAGE interrupted");
--					ret = -EINTR;
--					break;
--				}
--				spin_lock(&msg_queue_spinlock);
--			} while (user_service->msg_remove ==
--				user_service->msg_insert);
--
--			if (ret)
--				break;
--		}
--
--		BUG_ON((int)(user_service->msg_insert -
--			user_service->msg_remove) < 0);
--
--		header = user_service->msg_queue[user_service->msg_remove &
--			(MSG_QUEUE_SIZE - 1)];
--		user_service->msg_remove++;
--		spin_unlock(&msg_queue_spinlock);
--
--		up(&user_service->remove_event);
--		if (header == NULL)
--			ret = -ENOTCONN;
--		else if (header->size <= args.bufsize) {
--			/* Copy to user space if msgbuf is not NULL */
--			if ((args.buf == NULL) ||
--				(copy_to_user((void __user *)args.buf,
--				header->data,
--				header->size) == 0)) {
--				ret = header->size;
--				vchiq_release_message(
--					service->handle,
--					header);
--			} else
--				ret = -EFAULT;
--		} else {
--			vchiq_log_error(vchiq_arm_log_level,
--				"header %x: bufsize %x < size %x",
--				(unsigned int)header, args.bufsize,
--				header->size);
--			WARN(1, "invalid size\n");
--			ret = -EMSGSIZE;
--		}
--		DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
--	} break;
--
--	case VCHIQ_IOC_GET_CLIENT_ID: {
--		VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
--
--		ret = vchiq_get_client_id(handle);
--	} break;
--
--	case VCHIQ_IOC_GET_CONFIG: {
--		VCHIQ_GET_CONFIG_T args;
--		VCHIQ_CONFIG_T config;
--
--		if (copy_from_user(&args, (const void __user *)arg,
--			sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--		if (args.config_size > sizeof(config)) {
--			ret = -EINVAL;
--			break;
--		}
--		status = vchiq_get_config(instance, args.config_size, &config);
--		if (status == VCHIQ_SUCCESS) {
--			if (copy_to_user((void __user *)args.pconfig,
--				    &config, args.config_size) != 0) {
--				ret = -EFAULT;
--				break;
--			}
--		}
--	} break;
--
--	case VCHIQ_IOC_SET_SERVICE_OPTION: {
--		VCHIQ_SET_SERVICE_OPTION_T args;
--
--		if (copy_from_user(
--			&args, (const void __user *)arg,
--			sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--
--		service = find_service_for_instance(instance, args.handle);
--		if (!service) {
--			ret = -EINVAL;
--			break;
--		}
--
--		status = vchiq_set_service_option(
--				args.handle, args.option, args.value);
--	} break;
--
--	case VCHIQ_IOC_DUMP_PHYS_MEM: {
--		VCHIQ_DUMP_MEM_T  args;
--
--		if (copy_from_user
--			 (&args, (const void __user *)arg,
--			  sizeof(args)) != 0) {
--			ret = -EFAULT;
--			break;
--		}
--		dump_phys_mem(args.virt_addr, args.num_bytes);
--	} break;
--
--	default:
--		ret = -ENOTTY;
--		break;
--	}
--
--	if (service)
--		unlock_service(service);
--
--	if (ret == 0) {
--		if (status == VCHIQ_ERROR)
--			ret = -EIO;
--		else if (status == VCHIQ_RETRY)
--			ret = -EINTR;
--	}
--
--	if ((status == VCHIQ_SUCCESS) && (ret < 0) && (ret != -EINTR) &&
--		(ret != -EWOULDBLOCK))
--		vchiq_log_info(vchiq_arm_log_level,
--			"  ioctl instance %lx, cmd %s -> status %d, %ld",
--			(unsigned long)instance,
--			(_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ?
--				ioctl_names[_IOC_NR(cmd)] :
--				"<invalid>",
--			status, ret);
--	else
--		vchiq_log_trace(vchiq_arm_log_level,
--			"  ioctl instance %lx, cmd %s -> status %d, %ld",
--			(unsigned long)instance,
--			(_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ?
--				ioctl_names[_IOC_NR(cmd)] :
--				"<invalid>",
--			status, ret);
-+   VCHIQ_INSTANCE_T instance = file->private_data;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   long ret = 0;
-+   int i, rc;
-+   DEBUG_INITIALISE(g_state.local)
-+
-+   vcos_log_trace("vchiq_ioctl - instance %x, cmd %s, arg %lx",
-+      (unsigned int)instance,
-+      ((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) && (_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ?
-+      ioctl_names[_IOC_NR(cmd)] : "<invalid>", arg);
-+
-+   switch (cmd) {
-+   case VCHIQ_IOC_SHUTDOWN:
-+      if (!instance->connected)
-+         break;
-+
-+      /* Remove all services */
-+      for (i = 0; i < MAX_SERVICES; i++) {
-+         USER_SERVICE_T *service = &instance->services[i];
-+         if (service->service != NULL) {
-+            status = vchiq_remove_service(&service->service->base);
-+            if (status != VCHIQ_SUCCESS)
-+               break;
-+            service->service = NULL;
-+         }
-+      }
-+
-+      if (status == VCHIQ_SUCCESS) {
-+         /* Wake the completion thread and ask it to exit */
-+         instance->closing = 1;
-+         vcos_event_signal(&instance->insert_event);
-+      }
-+
-+      break;
-+
-+   case VCHIQ_IOC_CONNECT:
-+      if (instance->connected) {
-+         ret = -EINVAL;
-+         break;
-+      }
-+      if ((rc=vcos_mutex_lock(&instance->state->mutex)) != VCOS_SUCCESS) {
-+         vcos_log_error("vchiq: connect: could not lock mutex for state %d: %d",
-+                        instance->state->id, rc);
-+         ret = -EINTR;
-+         break;
-+      }
-+      status = vchiq_connect_internal(instance->state, instance);
-+      vcos_mutex_unlock(&instance->state->mutex);
-+
-+      if (status == VCHIQ_SUCCESS)
-+         instance->connected = 1;
-+      else
-+         vcos_log_error("vchiq: could not connect: %d", status);
-+      break;
-+
-+   case VCHIQ_IOC_CREATE_SERVICE:
-+      {
-+         VCHIQ_CREATE_SERVICE_T args;
-+         VCHIQ_SERVICE_T *service = NULL;
-+         USER_SERVICE_T *user_service = NULL;
-+         void *userdata;
-+         int srvstate;
-+
-+         if (copy_from_user
-+             (&args, (const void __user *)arg,
-+              sizeof(args)) != 0) {
-+            ret = -EFAULT;
-+            break;
-+         }
-+
-+         for (i = 0; i < MAX_SERVICES; i++) {
-+            if (instance->services[i].service == NULL) {
-+               user_service = &instance->services[i];
-+               break;
-+            }
-+         }
-+
-+         if (!user_service) {
-+            ret = -EMFILE;
-+            break;
-+         }
-+
-+         if (args.is_open) {
-+            if (instance->connected)
-+               srvstate = VCHIQ_SRVSTATE_OPENING;
-+            else {
-+               ret = -ENOTCONN;
-+               break;
-+            }
-+         } else {
-+            srvstate =
-+                instance->connected ?
-+                VCHIQ_SRVSTATE_LISTENING :
-+                VCHIQ_SRVSTATE_HIDDEN;
-+         }
-+
-+         vcos_mutex_lock(&instance->state->mutex);
-+
-+         userdata = args.params.userdata;
-+         args.params.callback = service_callback;
-+         args.params.userdata = user_service;
-+         service =
-+             vchiq_add_service_internal(instance->state,
-+                         &args.params, srvstate,
-+                         instance);
-+
-+         vcos_mutex_unlock(&instance->state->mutex);
-+
-+         if (service != NULL) {
-+            user_service->service = service;
-+            user_service->userdata = userdata;
-+            user_service->instance = instance;
-+            user_service->handle = i;
-+            user_service->is_vchi = args.is_vchi;
-+            user_service->dequeue_pending = 0;
-+            user_service->message_available_pos = instance->completion_remove - 1;
-+            user_service->msg_insert = 0;
-+            user_service->msg_remove = 0;
-+            vcos_event_create(&user_service->insert_event, "insert_event");
-+            vcos_event_create(&user_service->remove_event, "remove_event");
-+
-+            if (args.is_open) {
-+               status =
-+                   vchiq_open_service_internal
-+                   (service, instance->pid);
-+               if (status != VCHIQ_SUCCESS) {
-+                  vchiq_remove_service
-+                      (&service->base);
-+                  ret =
-+                      (status ==
-+                       VCHIQ_RETRY) ? -EINTR :
-+                      -EIO;
-+                  user_service->service = NULL;
-+                  user_service->instance = NULL;
-+                  vcos_event_delete(&user_service->insert_event);
-+                  vcos_event_delete(&user_service->remove_event);
-+                  break;
-+               }
-+            }
-+
-+            if (copy_to_user((void __user *)
-+                   &(((VCHIQ_CREATE_SERVICE_T __user
-+                       *) arg)->handle),
-+                   (const void *)&user_service->
-+                   handle,
-+                   sizeof(user_service->
-+                     handle)) != 0)
-+               ret = -EFAULT;
-+         } else {
-+            ret = -EEXIST;
-+         }
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_CLOSE_SERVICE:
-+      {
-+         USER_SERVICE_T *user_service;
-+         int handle = (int)arg;
-+
-+         user_service = find_service_by_handle(instance, handle);
-+         if (user_service != NULL)
-+         {
-+            int is_server = (user_service->service->public_fourcc != VCHIQ_FOURCC_INVALID);
-+
-+            status =
-+                vchiq_close_service(&user_service->service->base);
-+            if ((status == VCHIQ_SUCCESS) && !is_server)
-+            {
-+               vcos_event_delete(&user_service->insert_event);
-+               vcos_event_delete(&user_service->remove_event);
-+               user_service->service = NULL;
-+            }
-+         } else
-+            ret = -EINVAL;
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_REMOVE_SERVICE:
-+      {
-+         USER_SERVICE_T *user_service;
-+         int handle = (int)arg;
-+
-+         user_service = find_service_by_handle(instance, handle);
-+         if (user_service != NULL)
-+         {
-+            status =
-+                vchiq_remove_service(&user_service->service->base);
-+            if (status == VCHIQ_SUCCESS)
-+            {
-+               vcos_event_delete(&user_service->insert_event);
-+               vcos_event_delete(&user_service->remove_event);
-+               user_service->service = NULL;
-+            }
-+         } else
-+            ret = -EINVAL;
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_USE_SERVICE:
-+   case VCHIQ_IOC_RELEASE_SERVICE:
-+      {
-+         USER_SERVICE_T *user_service;
-+         int handle = (int)arg;
-+
-+         user_service = find_service_by_handle(instance, handle);
-+         if (user_service != NULL)
-+         {
-+            status = (cmd == VCHIQ_IOC_USE_SERVICE) ? vchiq_use_service(&user_service->service->base) : vchiq_release_service(&user_service->service->base);
-+            if (status != VCHIQ_SUCCESS)
-+            {
-+               ret = -EINVAL; /* ??? */
-+            }
-+         }
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_QUEUE_MESSAGE:
-+      {
-+         VCHIQ_QUEUE_MESSAGE_T args;
-+         USER_SERVICE_T *user_service;
-+
-+         if (copy_from_user
-+             (&args, (const void __user *)arg,
-+              sizeof(args)) != 0) {
-+            ret = -EFAULT;
-+            break;
-+         }
-+         user_service = find_service_by_handle(instance, args.handle);
-+         if ((user_service != NULL) && (args.count <= MAX_ELEMENTS))
-+         {
-+            /* Copy elements into kernel space */
-+            VCHIQ_ELEMENT_T elements[MAX_ELEMENTS];
-+            if (copy_from_user
-+                (elements, args.elements,
-+                 args.count * sizeof(VCHIQ_ELEMENT_T)) == 0)
-+               status =
-+                  vchiq_queue_message
-+                  (&user_service->service->base,
-+                   elements, args.count);
-+            else
-+               ret = -EFAULT;
-+         } else {
-+            ret = -EINVAL;
-+         }
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_QUEUE_BULK_TRANSMIT:
-+   case VCHIQ_IOC_QUEUE_BULK_RECEIVE:
-+      {
-+         VCHIQ_QUEUE_BULK_TRANSFER_T args;
-+         USER_SERVICE_T *user_service;
-+         VCHIQ_BULK_DIR_T dir =
-+           (cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ?
-+           VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;
-+
-+         if (copy_from_user
-+             (&args, (const void __user *)arg,
-+              sizeof(args)) != 0) {
-+            ret = -EFAULT;
-+            break;
-+         }
-+         user_service = find_service_by_handle(instance, args.handle);
-+         if (user_service != NULL)
-+         {
-+            status =
-+               vchiq_bulk_transfer
-+               ((VCHIQ_SERVICE_T *)user_service->service,
-+                VCHI_MEM_HANDLE_INVALID,
-+                args.data, args.size,
-+                args.userdata, args.mode,
-+                dir);
-+         } else {
-+            ret = -EINVAL;
-+         }
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_AWAIT_COMPLETION:
-+      {
-+         VCHIQ_AWAIT_COMPLETION_T args;
-+
-+         DEBUG_TRACE(AWAIT_COMPLETION_LINE);
-+         if (!instance->connected) {
-+            ret = -ENOTCONN;
-+            break;
-+         }
-+
-+         if (copy_from_user
-+             (&args, (const void __user *)arg,
-+              sizeof(args)) != 0) {
-+            ret = -EFAULT;
-+            break;
-+         }
-+         DEBUG_TRACE(AWAIT_COMPLETION_LINE);
-+         while ((instance->completion_remove ==
-+            instance->completion_insert)
-+                && !instance->closing) {
-+            DEBUG_TRACE(AWAIT_COMPLETION_LINE);
-+            if (vcos_event_wait(&instance->insert_event) !=
-+                VCOS_SUCCESS) {
-+               DEBUG_TRACE(AWAIT_COMPLETION_LINE);
-+               vcos_log_info
-+                   ("AWAIT_COMPLETION interrupted");
-+               ret = -EINTR;
-+               break;
-+            }
-+         }
-+         DEBUG_TRACE(AWAIT_COMPLETION_LINE);
-+
-+         /* A read memory barrier is needed to stop prefetch of a stale
-+            completion record */
-+         vcos_rmb();
-+
-+         if (ret == 0) {
-+            int msgbufcount = args.msgbufcount;
-+            for (ret = 0; ret < args.count; ret++) {
-+               VCHIQ_COMPLETION_DATA_T *completion;
-+               USER_SERVICE_T *service;
-+               VCHIQ_HEADER_T *header;
-+               if (instance->completion_remove ==
-+                   instance->completion_insert)
-+                  break;
-+               completion =
-+                   &instance->
-+                   completions
-+                   [instance->completion_remove &
-+                    (MAX_COMPLETIONS - 1)];
-+
-+               service = (USER_SERVICE_T *)completion->service_userdata;
-+               completion->service_userdata = service->userdata;
-+
-+               header = completion->header;
-+               if (header)
-+               {
-+                  void __user *msgbuf;
-+                  int msglen;
-+
-+                  msglen = header->size + sizeof(VCHIQ_HEADER_T);
-+                  /* This must be a VCHIQ-style service */
-+                  if (args.msgbufsize < msglen)
-+                  {
-+                     vcos_log_error("header %x: msgbufsize %x < msglen %x",
-+                        (unsigned int)header, args.msgbufsize, msglen);
-+                     vcos_assert(0);
-+                     if (ret == 0)
-+                        ret = -EMSGSIZE;
-+                     break;
-+                  }
-+                  if (msgbufcount <= 0)
-+                  {
-+                     /* Stall here for lack of a buffer for the message */
-+                     break;
-+                  }
-+                  /* Get the pointer from user space */
-+                  msgbufcount--;
-+                  if (copy_from_user(&msgbuf,
-+                     (const void __user *)&args.msgbufs[msgbufcount],
-+                     sizeof(msgbuf)) != 0)
-+                  {
-+                     if (ret == 0)
-+                        ret = -EFAULT;
-+                     break;
-+                  }
-+
-+                  /* Copy the message to user space */
-+                  if (copy_to_user(msgbuf, header, msglen) != 0)
-+                  {
-+                     if (ret == 0)
-+                        ret = -EFAULT;
-+                     break;
-+                  }
-+
-+                  /* Now it has been copied, the message can be released. */
-+                  vchiq_release_message(&service->service->base, header);
-+
-+                  /* The completion must point to the msgbuf */
-+                  completion->header = msgbuf;
-+               }
-+
-+               if (copy_to_user
-+                   ((void __user *)((size_t) args.buf +
-+                          ret *
-+                          sizeof
-+                          (VCHIQ_COMPLETION_DATA_T)),
-+                    completion,
-+                    sizeof(VCHIQ_COMPLETION_DATA_T)) !=
-+                   0) {
-+                  if (ret == 0)
-+                     ret = -EFAULT;
-+                  break;
-+               }
-+               instance->completion_remove++;
-+            }
-+
-+            if (msgbufcount != args.msgbufcount)
-+            {
-+               if (copy_to_user((void __user *)
-+                  &((VCHIQ_AWAIT_COMPLETION_T *)arg)->msgbufcount,
-+                  &msgbufcount, sizeof(msgbufcount)) != 0)
-+               {
-+                  ret = -EFAULT;
-+                  break;
-+               }
-+            }
-+         }
-+
-+         if (ret != 0)
-+            vcos_event_signal(&instance->remove_event);
-+         DEBUG_TRACE(AWAIT_COMPLETION_LINE);
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_DEQUEUE_MESSAGE:
-+      {
-+         VCHIQ_DEQUEUE_MESSAGE_T args;
-+         USER_SERVICE_T *user_service;
-+         VCHIQ_HEADER_T *header;
-+
-+         DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
-+         if (copy_from_user
-+             (&args, (const void __user *)arg,
-+              sizeof(args)) != 0) {
-+            ret = -EFAULT;
-+            break;
-+         }
-+         user_service = &instance->services[args.handle];
-+         if ((args.handle < 0) || (args.handle >= MAX_SERVICES) ||
-+            (user_service->service == NULL) ||
-+            (user_service->is_vchi == 0)) {
-+            ret = -EINVAL;
-+            break;
-+         }
-+         if (user_service->msg_remove == user_service->msg_insert)
-+         {
-+            if (!args.blocking)
-+            {
-+               DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
-+               ret = -EWOULDBLOCK;
-+               break;
-+            }
-+            user_service->dequeue_pending = 1;
-+            do {
-+               DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
-+               if (vcos_event_wait(&user_service->insert_event) !=
-+                   VCOS_SUCCESS) {
-+                  vcos_log_info("DEQUEUE_MESSAGE interrupted");
-+                  ret = -EINTR;
-+                  break;
-+               }
-+            }
-+            while (user_service->msg_remove == user_service->msg_insert);
-+         }
-+
-+         /* A read memory barrier is needed to stop prefetch of a stale
-+            header value */
-+         vcos_rmb();
-+
-+         header = user_service->msg_queue[user_service->msg_remove &
-+            (MSG_QUEUE_SIZE - 1)];
-+         if (header == NULL)
-+            ret = -ENOTCONN;
-+         else if (header->size <= args.bufsize)
-+         {
-+            /* Copy to user space if msgbuf is not NULL */
-+            if ((args.buf == NULL) ||
-+               (copy_to_user((void __user *)args.buf, header->data,
-+               header->size) == 0))
-+            {
-+               ret = header->size;
-+               vchiq_release_message(&user_service->service->base,
-+                  header);
-+               user_service->msg_remove++;
-+               vcos_event_signal(&user_service->remove_event);
-+            }
-+            else
-+               ret = -EFAULT;
-+         }
-+         else
-+         {
-+            vcos_log_error("header %x: bufsize %x < size %x",
-+               (unsigned int)header, args.bufsize, header->size);
-+            vcos_assert(0);
-+            ret = -EMSGSIZE;
-+         }
-+         DEBUG_TRACE(DEQUEUE_MESSAGE_LINE);
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_GET_CLIENT_ID:
-+      {
-+         USER_SERVICE_T *user_service;
-+         int handle = (int)arg;
-+
-+         user_service = find_service_by_handle(instance, handle);
-+         if (user_service != NULL)
-+            ret = vchiq_get_client_id(&user_service->service->base);
-+         else
-+            ret = 0;
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_GET_CONFIG:
-+      {
-+         VCHIQ_GET_CONFIG_T args;
-+         VCHIQ_CONFIG_T config;
-+
-+         if (copy_from_user
-+             (&args, (const void __user *)arg,
-+              sizeof(args)) != 0) {
-+            ret = -EFAULT;
-+            break;
-+         }
-+         if (args.config_size > sizeof(config))
-+         {
-+            ret = -EINVAL;
-+            break;
-+         }
-+         status = vchiq_get_config(instance, args.config_size, &config);
-+         if (status == VCHIQ_SUCCESS)
-+         {
-+            if (copy_to_user((void __user *)args.pconfig,
-+                   &config, args.config_size) != 0)
-+            {
-+               ret = -EFAULT;
-+               break;
-+            }
-+         }
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_SET_SERVICE_OPTION:
-+      {
-+         VCHIQ_SET_SERVICE_OPTION_T args;
-+         USER_SERVICE_T *user_service;
-+
-+         if (copy_from_user(
-+            &args, (const void __user *)arg,
-+            sizeof(args)) != 0)
-+         {
-+            ret = -EFAULT;
-+            break;
-+         }
-+
-+         user_service = find_service_by_handle(instance, args.handle);
-+         if (user_service != NULL)
-+         {
-+            status = vchiq_set_service_option(
-+               &user_service->service->base,
-+               args.option, args.value);
-+         }
-+         else
-+         {
-+            ret = -EINVAL;
-+         }
-+      }
-+      break;
-+
-+   case VCHIQ_IOC_DUMP_PHYS_MEM:
-+      {
-+         VCHIQ_DUMP_MEM_T  args;
-+
-+         if (copy_from_user
-+             (&args, (const void __user *)arg,
-+              sizeof(args)) != 0) {
-+            ret = -EFAULT;
-+            break;
-+         }
-+         dump_phys_mem( args.virt_addr, args.num_bytes );
-+      }
-+      break;
-+
-+
-+   default:
-+      ret = -ENOTTY;
-+      break;
-+   }
-+
-+   if (ret == 0) {
-+      if (status == VCHIQ_ERROR)
-+         ret = -EIO;
-+      else if (status == VCHIQ_RETRY)
-+         ret = -EINTR;
-+   }
-+
-+   if ((ret < 0) && (ret != -EINTR) && (ret != -EWOULDBLOCK))
-+      vcos_log_warn("  ioctl instance %lx, cmd %s -> status %d, %ld",
-+         (unsigned long)instance,
-+         (_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ? ioctl_names[_IOC_NR(cmd)] :
-+         "<invalid>", status, ret);
-+   else
-+      vcos_log_trace("  ioctl instance %lx, cmd %s -> status %d, %ld",
-+         (unsigned long)instance,
-+         (_IOC_NR(cmd) <= VCHIQ_IOC_MAX) ? ioctl_names[_IOC_NR(cmd)] :
-+         "<invalid>", status, ret);
- 
--	return ret;
-+   return ret;
- }
- 
- /****************************************************************************
-@@ -1005,49 +941,39 @@
- static int
- vchiq_open(struct inode *inode, struct file *file)
- {
--	int dev = iminor(inode) & 0x0f;
--	vchiq_log_info(vchiq_arm_log_level, "vchiq_open");
--	switch (dev) {
--	case VCHIQ_MINOR: {
--		int ret;
--		VCHIQ_STATE_T *state = vchiq_get_state();
--		VCHIQ_INSTANCE_T instance;
--
--		if (!state) {
--			vchiq_log_error(vchiq_arm_log_level,
--				"vchiq has no connection to VideoCore");
--			return -ENOTCONN;
--		}
--
--		instance = kzalloc(sizeof(*instance), GFP_KERNEL);
--		if (!instance)
--			return -ENOMEM;
--
--		instance->state = state;
--		instance->pid = current->tgid;
--
--		ret = vchiq_proc_add_instance(instance);
--		if (ret != 0) {
--			kfree(instance);
--			return ret;
--		}
--
--		sema_init(&instance->insert_event, 0);
--		sema_init(&instance->remove_event, 0);
--		mutex_init(&instance->completion_mutex);
--		mutex_init(&instance->bulk_waiter_list_mutex);
--		INIT_LIST_HEAD(&instance->bulk_waiter_list);
--
--		file->private_data = instance;
--	} break;
--
--	default:
--		vchiq_log_error(vchiq_arm_log_level,
--			"Unknown minor device: %d", dev);
--		return -ENXIO;
--	}
-+   int dev = iminor(inode) & 0x0f;
-+   vcos_log_info("vchiq_open");
-+   switch (dev) {
-+   case VCHIQ_MINOR:
-+      {
-+         VCHIQ_STATE_T *state = vchiq_get_state();
-+         VCHIQ_INSTANCE_T instance;
-+
-+         if (!state)
-+         {
-+            vcos_log_error( "vchiq has no connection to VideoCore");
-+            return -ENOTCONN;
-+         }
-+
-+         instance = kzalloc(sizeof(*instance), GFP_KERNEL);
-+         if (!instance)
-+            return -ENOMEM;
-+
-+         instance->state = state;
-+         instance->pid = current->tgid;
-+         vcos_event_create(&instance->insert_event, DEVICE_NAME);
-+         vcos_event_create(&instance->remove_event, DEVICE_NAME);
-+
-+         file->private_data = instance;
-+      }
-+      break;
-+
-+   default:
-+      vcos_log_error("Unknown minor device: %d", dev);
-+      return -ENXIO;
-+   }
- 
--	return 0;
-+   return 0;
- }
- 
- /****************************************************************************
-@@ -1059,131 +985,74 @@
- static int
- vchiq_release(struct inode *inode, struct file *file)
- {
--	int dev = iminor(inode) & 0x0f;
--	int ret = 0;
--	switch (dev) {
--	case VCHIQ_MINOR: {
--		VCHIQ_INSTANCE_T instance = file->private_data;
--		VCHIQ_STATE_T *state = vchiq_get_state();
--		VCHIQ_SERVICE_T *service;
--		int i;
--
--		vchiq_log_info(vchiq_arm_log_level,
--			"vchiq_release: instance=%lx",
--			(unsigned long)instance);
--
--		if (state) {
--			/* Ensure videocore is awake to allow termination. */
--			vchiq_use_internal(instance->state, NULL,
--					USE_TYPE_VCHIQ);
--		}
--
--		mutex_lock(&instance->completion_mutex);
--
--		/* Wake the completion thread and ask it to exit */
--		instance->closing = 1;
--		up(&instance->insert_event);
--
--		mutex_unlock(&instance->completion_mutex);
--
--		/* Wake the slot handler if the completion queue is full. */
--		up(&instance->remove_event);
--
--		/* Mark all services for termination... */
--		i = 0;
--		while ((service = next_service_by_instance(state, instance,
--			&i)) !=	NULL) {
--			USER_SERVICE_T *user_service = service->base.userdata;
--
--			/* Wake the slot handler if the msg queue is full. */
--			up(&user_service->remove_event);
--
--			vchiq_terminate_service_internal(service);
--			unlock_service(service);
--		}
--
--		/* ...and wait for them to die */
--		i = 0;
--		while ((service = next_service_by_instance(state, instance, &i))
--			!= NULL) {
--			USER_SERVICE_T *user_service = service->base.userdata;
--
--			down(&service->remove_event);
--
--			BUG_ON(service->srvstate != VCHIQ_SRVSTATE_FREE);
--
--			spin_lock(&msg_queue_spinlock);
--
--			while (user_service->msg_remove !=
--				user_service->msg_insert) {
--				VCHIQ_HEADER_T *header = user_service->
--					msg_queue[user_service->msg_remove &
--						(MSG_QUEUE_SIZE - 1)];
--				user_service->msg_remove++;
--				spin_unlock(&msg_queue_spinlock);
--
--				if (header)
--					vchiq_release_message(
--						service->handle,
--						header);
--				spin_lock(&msg_queue_spinlock);
--			}
--
--			spin_unlock(&msg_queue_spinlock);
--
--			unlock_service(service);
--			kfree(user_service);
--		}
--
--		/* Release any closed services */
--		while (instance->completion_remove !=
--			instance->completion_insert) {
--			VCHIQ_COMPLETION_DATA_T *completion;
--			VCHIQ_SERVICE_T *service;
--			completion = &instance->completions[
--				instance->completion_remove &
--				(MAX_COMPLETIONS - 1)];
--			service = completion->service_userdata;
--			if (completion->reason == VCHIQ_SERVICE_CLOSED)
--				unlock_service(service);
--			instance->completion_remove++;
--		}
--
--		if (state) {
--			/* Release the PEER service count. */
--			vchiq_release_internal(instance->state, NULL);
--		}
--
--		{
--			struct list_head *pos, *next;
--			list_for_each_safe(pos, next,
--				&instance->bulk_waiter_list) {
--				struct bulk_waiter_node *waiter;
--				waiter = list_entry(pos,
--					struct bulk_waiter_node,
--					list);
--				list_del(pos);
--				vchiq_log_info(vchiq_arm_log_level,
--					"bulk_waiter - cleaned up %x "
--					"for pid %d",
--					(unsigned int)waiter, waiter->pid);
--				kfree(waiter);
--			}
--		}
--
--		vchiq_proc_remove_instance(instance);
--
--		kfree(instance);
--		file->private_data = NULL;
--	} break;
--
--	default:
--		vchiq_log_error(vchiq_arm_log_level,
--			"Unknown minor device: %d", dev);
--		ret = -ENXIO;
--	}
-+   int dev = iminor(inode) & 0x0f;
-+   int ret = 0;
-+   switch (dev) {
-+   case VCHIQ_MINOR:
-+      {
-+         VCHIQ_INSTANCE_T instance = file->private_data;
-+         int i;
-+
-+         vcos_log_info("vchiq_release: instance=%lx",
-+                  (unsigned long)instance);
-+
-+         instance->closing = 1;
-+
-+         /* Wake the slot handler if the completion queue is full */
-+         vcos_event_signal(&instance->remove_event);
-+
-+         /* Mark all services for termination... */
-+
-+         for (i = 0; i < MAX_SERVICES; i++) {
-+            USER_SERVICE_T *user_service =
-+                &instance->services[i];
-+            if (user_service->service != NULL)
-+            {
-+               /* Wake the slot handler if the msg queue is full */
-+               vcos_event_signal(&user_service->remove_event);
-+
-+               if ((user_service->service->srvstate != VCHIQ_SRVSTATE_CLOSEWAIT) &&
-+                  (user_service->service->srvstate != VCHIQ_SRVSTATE_LISTENING))
-+               {
-+                  vchiq_terminate_service_internal(user_service->service);
-+               }
-+            }
-+         }
-+
-+         /* ...and wait for them to die */
-+
-+         for (i = 0; i < MAX_SERVICES; i++) {
-+            USER_SERVICE_T *user_service =
-+                &instance->services[i];
-+            if (user_service->service != NULL)
-+            {
-+               /* Wait in this non-portable fashion because interruptible
-+                  calls will not block in this context. */
-+               while ((user_service->service->srvstate != VCHIQ_SRVSTATE_CLOSEWAIT) &&
-+                  (user_service->service->srvstate != VCHIQ_SRVSTATE_LISTENING))
-+               {
-+                  down(&user_service->service->remove_event);
-+               }
-+
-+               vchiq_free_service_internal
-+                      (user_service->service);
-+            }
-+         }
-+
-+         vcos_event_delete(&instance->insert_event);
-+         vcos_event_delete(&instance->remove_event);
-+
-+         kfree(instance);
-+         file->private_data = NULL;
-+      }
-+      break;
-+
-+   default:
-+      vcos_log_error("Unknown minor device: %d", dev);
-+      ret = -ENXIO;
-+   }
- 
--	return ret;
-+   return ret;
- }
- 
- /****************************************************************************
-@@ -1195,37 +1064,40 @@
- void
- vchiq_dump(void *dump_context, const char *str, int len)
- {
--	DUMP_CONTEXT_T *context = (DUMP_CONTEXT_T *)dump_context;
-+   DUMP_CONTEXT_T *context = (DUMP_CONTEXT_T *)dump_context;
- 
--	if ((context->actual >= 0) && (context->actual < context->space)) {
--		int copy_bytes;
--		if (context->offset > 0) {
--			int skip_bytes = min(len, (int)context->offset);
--			str += skip_bytes;
--			len -= skip_bytes;
--			context->offset -= skip_bytes;
--			if (context->offset > 0)
--				return;
--		}
--		copy_bytes = min(len, (int)(context->space - context->actual));
--		if (copy_bytes == 0)
--			return;
--		if (copy_to_user(context->buf + context->actual, str,
--			copy_bytes))
--			context->actual = -EFAULT;
--		context->actual += copy_bytes;
--		len -= copy_bytes;
--
--		/* If tne terminating NUL is included in the length, then it
--		** marks the end of a line and should be replaced with a
--		** carriage return. */
--		if ((len == 0) && (str[copy_bytes - 1] == '\0')) {
--			char cr = '\n';
--			if (copy_to_user(context->buf + context->actual - 1,
--				&cr, 1))
--				context->actual = -EFAULT;
--		}
--	}
-+   if ((context->actual >= 0) && (context->actual < context->space))
-+   {
-+      int copy_bytes;
-+      if (context->offset > 0)
-+      {
-+         int skip_bytes = vcos_min(len, context->offset);
-+         str += skip_bytes;
-+         len -= skip_bytes;
-+         context->offset -= skip_bytes;
-+         if (context->offset > 0)
-+            return;
-+      }
-+      copy_bytes = vcos_min(len, context->space - context->actual);
-+      if (copy_bytes == 0)
-+         return;
-+      if (copy_to_user(context->buf + context->actual, str, copy_bytes))
-+         context->actual = -EFAULT;
-+      context->actual += copy_bytes;
-+      len -= copy_bytes;
-+
-+      /* If tne terminating NUL is included in the length, then it marks
-+       * the end of a line and should be replaced with a carriage return.
-+       */
-+      if ((len == 0) && (str[copy_bytes - 1] == '\0'))
-+      {
-+         char cr = '\n';
-+         if (copy_to_user(context->buf + context->actual - 1, &cr, 1))
-+         {
-+            context->actual = -EFAULT;
-+         }
-+      }
-+   }
- }
- 
- /****************************************************************************
-@@ -1237,48 +1109,49 @@
- void
- vchiq_dump_platform_instances(void *dump_context)
- {
--	VCHIQ_STATE_T *state = vchiq_get_state();
--	char buf[80];
--	int len;
--	int i;
--
--	/* There is no list of instances, so instead scan all services,
--		marking those that have been dumped. */
--
--	for (i = 0; i < state->unused_service; i++) {
--		VCHIQ_SERVICE_T *service = state->services[i];
--		VCHIQ_INSTANCE_T instance;
--
--		if (service && (service->base.callback == service_callback)) {
--			instance = service->instance;
--			if (instance)
--				instance->mark = 0;
--		}
--	}
--
--	for (i = 0; i < state->unused_service; i++) {
--		VCHIQ_SERVICE_T *service = state->services[i];
--		VCHIQ_INSTANCE_T instance;
--
--		if (service && (service->base.callback == service_callback)) {
--			instance = service->instance;
--			if (instance && !instance->mark) {
--				len = snprintf(buf, sizeof(buf),
--					"Instance %x: pid %d,%s completions "
--						"%d/%d",
--					(unsigned int)instance, instance->pid,
--					instance->connected ? " connected, " :
--						"",
--					instance->completion_insert -
--						instance->completion_remove,
--					MAX_COMPLETIONS);
--
--				vchiq_dump(dump_context, buf, len + 1);
--
--				instance->mark = 1;
--			}
--		}
--	}
-+   VCHIQ_STATE_T *state = vchiq_get_state();
-+   char buf[80];
-+   int len;
-+   int i;
-+
-+   /* There is no list of instances, so instead scan all services,
-+      marking those that have been dumped. */
-+
-+   for (i = 0; i < state->unused_service; i++)
-+   {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      VCHIQ_INSTANCE_T instance;
-+
-+      if (service
-+         && ((instance = service->instance) != NULL)
-+         && (service->base.callback == service_callback))
-+         instance->mark = 0;
-+   }
-+
-+   for (i = 0; i < state->unused_service; i++)
-+   {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      VCHIQ_INSTANCE_T instance;
-+
-+      if (service
-+         && ((instance = service->instance) != NULL)
-+         && (service->base.callback == service_callback))
-+      {
-+         if (!instance->mark)
-+         {
-+            len = vcos_snprintf(buf, sizeof(buf),
-+               "Instance %x: pid %d,%s completions %d/%d",
-+               (unsigned int)instance, instance->pid,
-+               instance->connected ? " connected," : "",
-+               instance->completion_insert - instance->completion_remove,
-+               MAX_COMPLETIONS);
-+
-+            vchiq_dump(dump_context, buf, len + 1);
-+
-+            instance->mark = 1;
-+         }
-+      }
-+   }
- }
- 
- /****************************************************************************
-@@ -1290,26 +1163,26 @@
- void
- vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
- {
--	USER_SERVICE_T *user_service = (USER_SERVICE_T *)service->base.userdata;
--	char buf[80];
--	int len;
--
--	len = snprintf(buf, sizeof(buf), "  instance %x",
--		(unsigned int)service->instance);
--
--	if ((service->base.callback == service_callback) &&
--		user_service->is_vchi) {
--		len += snprintf(buf + len, sizeof(buf) - len,
--			", %d/%d messages",
--			user_service->msg_insert - user_service->msg_remove,
--			MSG_QUEUE_SIZE);
--
--		if (user_service->dequeue_pending)
--			len += snprintf(buf + len, sizeof(buf) - len,
--				" (dequeue pending)");
--	}
-+   USER_SERVICE_T *user_service = (USER_SERVICE_T *)service->base.userdata;
-+   char buf[80];
-+   int len;
-+
-+   len = vcos_snprintf(buf, sizeof(buf), "  instance %x",
-+      service->instance);
-+
-+   if ((service->base.callback == service_callback) && user_service->is_vchi)
-+   {
-+      len += vcos_snprintf(buf + len, sizeof(buf) - len,
-+         ", %d/%d messages",
-+         user_service->msg_insert - user_service->msg_remove,
-+         MSG_QUEUE_SIZE);
-+
-+      if (user_service->dequeue_pending)
-+         len += vcos_snprintf(buf + len, sizeof(buf) - len,
-+            " (dequeue pending)");
-+   }
- 
--	vchiq_dump(dump_context, buf, len + 1);
-+   vchiq_dump(dump_context, buf, len + 1);
- }
- 
- /****************************************************************************
-@@ -1319,82 +1192,79 @@
- ***************************************************************************/
- 
- static void
--dump_phys_mem(void *virt_addr, uint32_t num_bytes)
-+dump_phys_mem( void *virt_addr, uint32_t num_bytes )
- {
--	int            rc;
--	uint8_t       *end_virt_addr = virt_addr + num_bytes;
--	int            num_pages;
--	int            offset;
--	int            end_offset;
--	int            page_idx;
--	int            prev_idx;
--	struct page   *page;
--	struct page  **pages;
--	uint8_t       *kmapped_virt_ptr;
--
--	/* Align virtAddr and endVirtAddr to 16 byte boundaries. */
--
--	virt_addr = (void *)((unsigned long)virt_addr & ~0x0fuL);
--	end_virt_addr = (void *)(((unsigned long)end_virt_addr + 15uL) &
--		~0x0fuL);
--
--	offset = (int)(long)virt_addr & (PAGE_SIZE - 1);
--	end_offset = (int)(long)end_virt_addr & (PAGE_SIZE - 1);
--
--	num_pages = (offset + num_bytes + PAGE_SIZE - 1) / PAGE_SIZE;
--
--	pages = kmalloc(sizeof(struct page *) * num_pages, GFP_KERNEL);
--	if (pages == NULL) {
--		vchiq_log_error(vchiq_arm_log_level,
--			"Unable to allocation memory for %d pages\n",
--			num_pages);
--		return;
--	}
--
--	down_read(&current->mm->mmap_sem);
--	rc = get_user_pages(current,      /* task */
--		current->mm,              /* mm */
--		(unsigned long)virt_addr, /* start */
--		num_pages,                /* len */
--		0,                        /* write */
--		0,                        /* force */
--		pages,                    /* pages (array of page pointers) */
--		NULL);                    /* vmas */
--	up_read(&current->mm->mmap_sem);
--
--	prev_idx = -1;
--	page = NULL;
--
--	while (offset < end_offset) {
--
--		page_idx = offset / PAGE_SIZE;
--		int page_offset = offset % PAGE_SIZE;
--
--		if (page_idx != prev_idx) {
--
--			if (page != NULL)
--				kunmap(page);
--			page = pages[page_idx];
--			kmapped_virt_ptr = kmap(page);
--
--			prev_idx = page_idx;
--		}
--
--		if (vchiq_arm_log_level >= VCHIQ_LOG_TRACE)
--			vchiq_log_dump_mem("ph",
--				(uint32_t)(unsigned long)&kmapped_virt_ptr[
--					page_offset],
--				&kmapped_virt_ptr[page_offset], 16);
--
--		offset += 16;
--	}
--	if (page != NULL)
--		kunmap(page);
--
--	for (page_idx = 0; page_idx < num_pages; page_idx++)
--		page_cache_release(pages[page_idx]);
--
--	kfree(pages);
-+   int            rc;
-+   uint8_t       *end_virt_addr = virt_addr + num_bytes;
-+   int            num_pages;
-+   int            offset;
-+   int            end_offset;
-+   int            page_idx;
-+   int            prev_idx;
-+   struct page   *page;
-+   struct page  **pages;
-+   uint8_t       *kmapped_virt_ptr;
-+
-+   // Align virtAddr and endVirtAddr to 16 byte boundaries.
-+
-+   virt_addr = (void *)((unsigned long)virt_addr & ~0x0fuL );
-+   end_virt_addr = (void *)(( (unsigned long)end_virt_addr + 15uL ) & ~0x0fuL);
-+
-+   offset = (int)(long)virt_addr & ( PAGE_SIZE - 1 );
-+   end_offset = (int)(long)end_virt_addr & ( PAGE_SIZE - 1 );
-+
-+   num_pages = (offset + num_bytes + PAGE_SIZE - 1) / PAGE_SIZE;
-+
-+   if (( pages = kmalloc( sizeof( struct page *) * num_pages, GFP_KERNEL )) == NULL )
-+   {
-+      printk( KERN_ERR "Unable to allocation memory for %d pages\n", num_pages );
-+      return;
-+   }
-+
-+   down_read( &current->mm->mmap_sem );
-+   rc = get_user_pages( current,                   /* task */
-+                        current->mm,               /* mm */
-+                        (unsigned long)virt_addr,  /* start */
-+                        num_pages,                 /* len */
-+                        0,                         /* write */
-+                        0,                         /* force */
-+                        pages,                     /* pages (array of pointers to page) */
-+                        NULL );                    /* vmas */
-+   up_read( &current->mm->mmap_sem );
-+
-+   prev_idx = -1;
-+   page = NULL;
-+
-+   while ( offset < end_offset ) {
-+
-+      int page_offset = offset % PAGE_SIZE;
-+      page_idx = offset / PAGE_SIZE;
-+
-+      if ( page_idx != prev_idx ) {
-+
-+         if (page != NULL) {
-+            kunmap( page );
-+         }
-+         page = pages[page_idx];
-+         kmapped_virt_ptr = kmap( page );
-+
-+         prev_idx = page_idx;
-+      }
-+
-+      vcos_log_dump_mem_impl( &vchiq_arm_log_category, "ph",
-+                              (uint32_t)(unsigned long)&kmapped_virt_ptr[page_offset],
-+                              &kmapped_virt_ptr[page_offset], 16 );
-+
-+      offset += 16;
-+   }
-+   if (page != NULL) {
-+      kunmap( page );
-+   }
-+
-+   for ( page_idx = 0; page_idx < num_pages; page_idx++ ) {
-+      page_cache_release( pages[page_idx] );
-+   }
-+   kfree( pages );
- }
- 
- /****************************************************************************
-@@ -1404,1182 +1274,548 @@
- ***************************************************************************/
- 
- static ssize_t
--vchiq_read(struct file *file, char __user *buf,
--	size_t count, loff_t *ppos)
-+vchiq_read(struct file * file, char __user * buf,
-+   size_t count, loff_t *ppos)
- {
--	DUMP_CONTEXT_T context;
--	context.buf = buf;
--	context.actual = 0;
--	context.space = count;
--	context.offset = *ppos;
-+   DUMP_CONTEXT_T context;
-+   context.buf = buf;
-+   context.actual = 0;
-+   context.space = count;
-+   context.offset = *ppos;
- 
--	vchiq_dump_state(&context, &g_state);
-+   vchiq_dump_state(&context, &g_state);
- 
--	if (context.actual >= 0)
--		*ppos += context.actual;
-+   if (context.actual >= 0)
-+      *ppos += context.actual;
- 
--	return context.actual;
-+   return context.actual;
- }
- 
- VCHIQ_STATE_T *
- vchiq_get_state(void)
- {
- 
--	if (g_state.remote == NULL)
--		printk(KERN_ERR "%s: g_state.remote == NULL\n", __func__);
--	else if (g_state.remote->initialised != 1)
--		printk(KERN_ERR "%s: g_state.remote->initialised != 1 (%d)\n",
--			__func__, g_state.remote->initialised);
-+   if (g_state.remote == NULL)
-+   {
-+      printk( "%s: g_state.remote == NULL\n", __func__ );
-+   }
-+   else
-+   {
-+      if ( g_state.remote->initialised != 1)
-+      {
-+         printk( "%s: g_state.remote->initialised != 1 (%d)\n", __func__, g_state.remote->initialised );
-+      }
-+   }
- 
--	return ((g_state.remote != NULL) &&
--		(g_state.remote->initialised == 1)) ? &g_state : NULL;
-+   return ((g_state.remote != NULL) &&
-+      (g_state.remote->initialised == 1)) ? &g_state : NULL;
- }
- 
- static const struct file_operations
- vchiq_fops = {
--	.owner = THIS_MODULE,
--	.unlocked_ioctl = vchiq_ioctl,
--	.open = vchiq_open,
--	.release = vchiq_release,
--	.read = vchiq_read
-+   .owner = THIS_MODULE,
-+   .unlocked_ioctl = vchiq_ioctl,
-+   .open = vchiq_open,
-+   .release = vchiq_release,
-+   .read = vchiq_read
- };
- 
- /*
-  * Autosuspend related functionality
-  */
- 
--int
--vchiq_videocore_wanted(VCHIQ_STATE_T *state)
--{
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	if (!arm_state)
--		/* autosuspend not supported - always return wanted */
--		return 1;
--	else if (arm_state->blocked_count)
--		return 1;
--	else if (!arm_state->videocore_use_count)
--		/* usage count zero - check for override unless we're forcing */
--		if (arm_state->resume_blocked)
--			return 0;
--		else
--			return vchiq_platform_videocore_wanted(state);
--	else
--		/* non-zero usage count - videocore still required */
--		return 1;
--}
--static VCHIQ_STATUS_T vchiq_keepalive_vchiq_callback(VCHIQ_REASON_T reason,
--	VCHIQ_HEADER_T *header,
--	VCHIQ_SERVICE_HANDLE_T service_user,
--	void *bulk_user)
--{
--	vchiq_log_error(vchiq_susp_log_level,
--		"%s callback reason %d", __func__, reason);
--	return 0;
--}
--
--static int
--vchiq_keepalive_thread_func(void *v)
-+static int vchiq_videocore_wanted(VCHIQ_STATE_T* state)
- {
--	VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--
--	VCHIQ_STATUS_T status;
--	VCHIQ_INSTANCE_T instance;
--	VCHIQ_SERVICE_HANDLE_T ka_handle;
--
--	VCHIQ_SERVICE_PARAMS_T params = {
--		.fourcc      = VCHIQ_MAKE_FOURCC('K', 'E', 'E', 'P'),
--		.callback    = vchiq_keepalive_vchiq_callback,
--		.version     = KEEPALIVE_VER,
--		.version_min = KEEPALIVE_VER_MIN
--	};
--
--	status = vchiq_initialise(&instance);
--	if (status != VCHIQ_SUCCESS) {
--		vchiq_log_error(vchiq_susp_log_level,
--			"%s vchiq_initialise failed %d", __func__, status);
--		goto exit;
--	}
--
--	status = vchiq_connect(instance);
--	if (status != VCHIQ_SUCCESS) {
--		vchiq_log_error(vchiq_susp_log_level,
--			"%s vchiq_connect failed %d", __func__, status);
--		goto shutdown;
--	}
--
--	status = vchiq_add_service(instance, &params, &ka_handle);
--	if (status != VCHIQ_SUCCESS) {
--		vchiq_log_error(vchiq_susp_log_level,
--			"%s vchiq_open_service failed %d", __func__, status);
--		goto shutdown;
--	}
--
--	while (1) {
--		long rc = 0, uc = 0;
--		if (wait_for_completion_interruptible(&arm_state->ka_evt)
--				!= 0) {
--			vchiq_log_error(vchiq_susp_log_level,
--				"%s interrupted", __func__);
--			flush_signals(current);
--			continue;
--		}
--
--		/* read and clear counters.  Do release_count then use_count to
--		 * prevent getting more releases than uses */
--		rc = atomic_xchg(&arm_state->ka_release_count, 0);
--		uc = atomic_xchg(&arm_state->ka_use_count, 0);
--
--		/* Call use/release service the requisite number of times.
--		 * Process use before release so use counts don't go negative */
--		while (uc--) {
--			atomic_inc(&arm_state->ka_use_ack_count);
--			status = vchiq_use_service(ka_handle);
--			if (status != VCHIQ_SUCCESS) {
--				vchiq_log_error(vchiq_susp_log_level,
--					"%s vchiq_use_service error %d",
--					__func__, status);
--			}
--		}
--		while (rc--) {
--			status = vchiq_release_service(ka_handle);
--			if (status != VCHIQ_SUCCESS) {
--				vchiq_log_error(vchiq_susp_log_level,
--					"%s vchiq_release_service error %d",
--					__func__, status);
--			}
--		}
--	}
--
--shutdown:
--	vchiq_shutdown(instance);
--exit:
--	return 0;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+   if(!arm_state)
-+   { // autosuspend not supported - always return wanted
-+      return 1;
-+   }
-+   else if(!arm_state->videocore_use_count)
-+   { // usage count zero - check for override
-+      return vchiq_platform_videocore_wanted(state);
-+   }
-+   else
-+   { // non-zero usage count - videocore still required
-+      return 1;
-+   }
-+}
-+
-+
-+/* Called by the lp thread */
-+static void *
-+lp_func(void *v)
-+{
-+   VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+
-+   while (1) {
-+      vcos_event_wait(&arm_state->lp_evt);
-+
-+      vcos_mutex_lock(&arm_state->use_count_mutex);
-+      if (!vchiq_videocore_wanted(state))
-+      {
-+         arm_state->suspend_pending = 1;
-+      }
-+      vcos_mutex_unlock(&arm_state->use_count_mutex);
-+
-+      vchiq_arm_vcsuspend(state);
-+   }
-+   return NULL;
-+}
-+/* Called by the hp thread */
-+static void *
-+hp_func(void *v)
-+{
-+   VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+   int send_pending;
-+
-+   while (1) {
-+      vcos_event_wait(&arm_state->hp_evt);
-+
-+      send_pending = 0;
-+
-+      vcos_mutex_lock(&arm_state->use_count_mutex);
-+      if (vchiq_videocore_wanted(state))
-+      {
-+         vchiq_arm_vcresume(state);
-+      }
-+      if(arm_state->use_notify_pending)
-+      {
-+         send_pending = arm_state->use_notify_pending;
-+         arm_state->use_notify_pending=0;
-+      }
-+      vcos_mutex_unlock(&arm_state->use_count_mutex);
-+      while(send_pending--)
-+      {
-+         vcos_log_info( "%s sending VCHIQ_MSG_REMOTE_USE_ACTIVE", __func__);
-+         if ( vchiq_send_remote_use_active(state) != VCHIQ_SUCCESS)
-+         {
-+            BUG();  /* vc should be resumed, so shouldn't be a problem sending message */
-+         }
-+      }
-+   }
-+   return NULL;
- }
- 
--
- VCHIQ_STATUS_T
--vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state)
-+vchiq_arm_init_state(VCHIQ_STATE_T* state, VCHIQ_ARM_STATE_T *arm_state)
- {
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
--	char threadname[10];
--
--	if (arm_state) {
--		mutex_init(&arm_state->vc_use_cnt_mutex);
--		rwlock_init(&arm_state->susp_res_lock);
--
--		init_completion(&arm_state->ka_evt);
--		atomic_set(&arm_state->ka_use_count, 0);
--		atomic_set(&arm_state->ka_use_ack_count, 0);
--		atomic_set(&arm_state->ka_release_count, 0);
--
--		init_completion(&arm_state->vc_suspend_complete);
--
--		init_completion(&arm_state->vc_resume_complete);
--		/* Initialise to 'done' state.  We only want to block on resume
--		 * completion while videocore is suspended. */
--		set_resume_state(arm_state, VC_RESUME_RESUMED);
--
--		init_completion(&arm_state->resume_blocker);
--		/* Initialise to 'done' state.  We only want to block on this
--		 * completion while resume is blocked */
--		complete_all(&arm_state->resume_blocker);
--
--		init_completion(&arm_state->blocked_blocker);
--		/* Initialise to 'done' state.  We only want to block on this
--		 * completion while things are waiting on the resume blocker */
--		complete_all(&arm_state->blocked_blocker);
--
--		snprintf(threadname, sizeof(threadname), "VCHIQka-%d",
--			state->id);
--		arm_state->ka_thread = kthread_create(
--			&vchiq_keepalive_thread_func,
--			(void *)state,
--			threadname);
--		if (arm_state->ka_thread == NULL) {
--			vchiq_log_error(vchiq_susp_log_level,
--				"vchiq: FATAL: couldn't create thread %s",
--				threadname);
--			status = VCHIQ_ERROR;
--		}
--
--		arm_state->suspend_timer_timeout = SUSPEND_TIMER_TIMEOUT_MS;
--		arm_state->suspend_timer_running = 0;
--		init_timer(&arm_state->suspend_timer);
--		arm_state->suspend_timer.data = (unsigned long)(state);
--		arm_state->suspend_timer.function = suspend_timer_callback;
--
--		arm_state->first_connect = 0;
--
--	}
--	return status;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   VCOS_THREAD_ATTR_T attrs;
-+   char threadname[10];
-+
-+   if(arm_state)
-+   {
-+      vcos_mutex_create(&arm_state->use_count_mutex, "v.use_count_mutex");
-+      vcos_mutex_create(&arm_state->suspend_resume_mutex, "v.susp_res_mutex");
-+
-+      vcos_event_create(&arm_state->lp_evt, "LP_EVT");
-+      vcos_event_create(&arm_state->hp_evt, "HP_EVT");
-+
-+      vcos_thread_attr_init(&attrs);
-+      vcos_thread_attr_setstacksize(&attrs, VCHIQ_ARM_VCSUSPEND_TASK_STACK);
-+      vcos_thread_attr_setpriority(&attrs, VCOS_THREAD_PRI_LOWEST);
-+      vcos_snprintf(threadname, sizeof(threadname), "VCHIQl-%d", state->id);
-+      if(vcos_thread_create(&arm_state->lp_thread, threadname, &attrs, lp_func, state) != VCOS_SUCCESS)
-+      {
-+         vcos_log_error("vchiq: FATAL: couldn't create thread %s", threadname);
-+         status = VCHIQ_ERROR;
-+      }
-+      else
-+      {
-+         vcos_thread_attr_init(&attrs);
-+         vcos_thread_attr_setstacksize(&attrs, VCHIQ_ARM_VCSUSPEND_TASK_STACK);
-+         vcos_thread_attr_setpriority(&attrs, VCOS_THREAD_PRI_HIGHEST);
-+         vcos_snprintf(threadname, sizeof(threadname), "VCHIQh-%d", state->id);
-+
-+         if(vcos_thread_create(&arm_state->hp_thread, threadname, &attrs, hp_func, state) != VCOS_SUCCESS)
-+         {
-+            vcos_log_error("vchiq: FATAL: couldn't create thread %s", threadname);
-+            status = VCHIQ_ERROR;
-+         }
-+      }
-+   }
-+   return status;
- }
- 
--/*
--** Functions to modify the state variables;
--**	set_suspend_state
--**	set_resume_state
--**
--** There are more state variables than we might like, so ensure they remain in
--** step.  Suspend and resume state are maintained separately, since most of
--** these state machines can operate independently.  However, there are a few
--** states where state transitions in one state machine cause a reset to the
--** other state machine.  In addition, there are some completion events which
--** need to occur on state machine reset and end-state(s), so these are also
--** dealt with in these functions.
--**
--** In all states we set the state variable according to the input, but in some
--** cases we perform additional steps outlined below;
--**
--** VC_SUSPEND_IDLE - Initialise the suspend completion at the same time.
--**			The suspend completion is completed after any suspend
--**			attempt.  When we reset the state machine we also reset
--**			the completion.  This reset occurs when videocore is
--**			resumed, and also if we initiate suspend after a suspend
--**			failure.
--**
--** VC_SUSPEND_IN_PROGRESS - This state is considered the point of no return for
--**			suspend - ie from this point on we must try to suspend
--**			before resuming can occur.  We therefore also reset the
--**			resume state machine to VC_RESUME_IDLE in this state.
--**
--** VC_SUSPEND_SUSPENDED - Suspend has completed successfully. Also call
--**			complete_all on the suspend completion to notify
--**			anything waiting for suspend to happen.
--**
--** VC_SUSPEND_REJECTED - Videocore rejected suspend. Videocore will also
--**			initiate resume, so no need to alter resume state.
--**			We call complete_all on the suspend completion to notify
--**			of suspend rejection.
--**
--** VC_SUSPEND_FAILED - We failed to initiate videocore suspend.  We notify the
--**			suspend completion and reset the resume state machine.
--**
--** VC_RESUME_IDLE - Initialise the resume completion at the same time.  The
--**			resume completion is in it's 'done' state whenever
--**			videcore is running.  Therfore, the VC_RESUME_IDLE state
--**			implies that videocore is suspended.
--**			Hence, any thread which needs to wait until videocore is
--**			running can wait on this completion - it will only block
--**			if videocore is suspended.
--**
--** VC_RESUME_RESUMED - Resume has completed successfully.  Videocore is running.
--**			Call complete_all on the resume completion to unblock
--**			any threads waiting for resume.	 Also reset the suspend
--**			state machine to it's idle state.
--**
--** VC_RESUME_FAILED - Currently unused - no mechanism to fail resume exists.
--*/
--
--inline void
--set_suspend_state(VCHIQ_ARM_STATE_T *arm_state,
--	enum vc_suspend_status new_state)
--{
--	/* set the state in all cases */
--	arm_state->vc_suspend_state = new_state;
--
--	/* state specific additional actions */
--	switch (new_state) {
--	case VC_SUSPEND_FORCE_CANCELED:
--		complete_all(&arm_state->vc_suspend_complete);
--		break;
--	case VC_SUSPEND_REJECTED:
--		complete_all(&arm_state->vc_suspend_complete);
--		break;
--	case VC_SUSPEND_FAILED:
--		complete_all(&arm_state->vc_suspend_complete);
--		arm_state->vc_resume_state = VC_RESUME_RESUMED;
--		complete_all(&arm_state->vc_resume_complete);
--		break;
--	case VC_SUSPEND_IDLE:
--		INIT_COMPLETION(arm_state->vc_suspend_complete);
--		break;
--	case VC_SUSPEND_REQUESTED:
--		break;
--	case VC_SUSPEND_IN_PROGRESS:
--		set_resume_state(arm_state, VC_RESUME_IDLE);
--		break;
--	case VC_SUSPEND_SUSPENDED:
--		complete_all(&arm_state->vc_suspend_complete);
--		break;
--	default:
--		BUG();
--		break;
--	}
--}
--
--inline void
--set_resume_state(VCHIQ_ARM_STATE_T *arm_state,
--	enum vc_resume_status new_state)
--{
--	/* set the state in all cases */
--	arm_state->vc_resume_state = new_state;
--
--	/* state specific additional actions */
--	switch (new_state) {
--	case VC_RESUME_FAILED:
--		break;
--	case VC_RESUME_IDLE:
--		INIT_COMPLETION(arm_state->vc_resume_complete);
--		break;
--	case VC_RESUME_REQUESTED:
--		break;
--	case VC_RESUME_IN_PROGRESS:
--		break;
--	case VC_RESUME_RESUMED:
--		complete_all(&arm_state->vc_resume_complete);
--		set_suspend_state(arm_state, VC_SUSPEND_IDLE);
--		break;
--	default:
--		BUG();
--		break;
--	}
--}
--
--
--/* should be called with the write lock held */
--inline void
--start_suspend_timer(VCHIQ_ARM_STATE_T *arm_state)
--{
--	del_timer(&arm_state->suspend_timer);
--	arm_state->suspend_timer.expires = jiffies +
--		msecs_to_jiffies(arm_state->
--			suspend_timer_timeout);
--	add_timer(&arm_state->suspend_timer);
--	arm_state->suspend_timer_running = 1;
--}
--
--/* should be called with the write lock held */
--static inline void
--stop_suspend_timer(VCHIQ_ARM_STATE_T *arm_state)
--{
--	if (arm_state->suspend_timer_running) {
--		del_timer(&arm_state->suspend_timer);
--		arm_state->suspend_timer_running = 0;
--	}
--}
--
--static inline int
--need_resume(VCHIQ_STATE_T *state)
--{
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	return (arm_state->vc_suspend_state > VC_SUSPEND_IDLE) &&
--			(arm_state->vc_resume_state < VC_RESUME_REQUESTED) &&
--			vchiq_videocore_wanted(state);
--}
- 
--static int
--block_resume(VCHIQ_ARM_STATE_T *arm_state)
--{
--	int status = VCHIQ_SUCCESS;
--	while (arm_state->blocked_count) {
--		INIT_COMPLETION(arm_state->blocked_blocker);
--		write_unlock_bh(&arm_state->susp_res_lock);
--		vchiq_log_info(vchiq_susp_log_level, "%s wait for previously "
--			"blocked clients", __func__);
--		if (wait_for_completion_interruptible_timeout(
--				&arm_state->blocked_blocker,
--				msecs_to_jiffies(FORCE_SUSPEND_TIMEOUT_MS))
--					<= 0) {
--			vchiq_log_error(vchiq_susp_log_level, "%s wait for "
--				"previously blocked clients failed" , __func__);
--			status = VCHIQ_ERROR;
--			write_lock_bh(&arm_state->susp_res_lock);
--			goto out;
--		}
--		vchiq_log_info(vchiq_susp_log_level, "%s previously blocked "
--			"clients resumed", __func__);
--		write_lock_bh(&arm_state->susp_res_lock);
--	}
--	while (arm_state->vc_resume_state != VC_RESUME_RESUMED &&
--			arm_state->vc_resume_state > VC_RESUME_IDLE) {
--		if (!try_wait_for_completion(&arm_state->vc_resume_complete)) {
--			write_unlock_bh(&arm_state->susp_res_lock);
--			vchiq_log_info(vchiq_susp_log_level, "%s wait for "
--				"resume", __func__);
--			if (wait_for_completion_interruptible_timeout(
--					&arm_state->vc_resume_complete,
--					msecs_to_jiffies(
--						FORCE_SUSPEND_TIMEOUT_MS))
--							<= 0) {
--				vchiq_log_error(vchiq_susp_log_level, "%s wait "
--					"for resume failed (%s)", __func__,
--					resume_state_names[
--						arm_state->vc_resume_state +
--						VC_RESUME_NUM_OFFSET]);
--				status = VCHIQ_ERROR;
--				write_lock_bh(&arm_state->susp_res_lock);
--				goto out;
--			}
--			vchiq_log_info(vchiq_susp_log_level, "%s resumed",
--				__func__);
--			write_lock_bh(&arm_state->susp_res_lock);
--		}
--	}
--	INIT_COMPLETION(arm_state->resume_blocker);
--	arm_state->resume_blocked = 1;
--
--out:
--	return status;
--}
--
--inline static void
--unblock_resume(VCHIQ_ARM_STATE_T *arm_state)
--{
--	complete_all(&arm_state->resume_blocker);
--	arm_state->resume_blocked = 0;
--}
--
--/* Initiate suspend via slot handler. Should be called with the write lock
-- * held */
- VCHIQ_STATUS_T
- vchiq_arm_vcsuspend(VCHIQ_STATE_T *state)
- {
--	VCHIQ_STATUS_T status = VCHIQ_ERROR;
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--
--	if (!arm_state)
--		goto out;
--
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--	status = VCHIQ_SUCCESS;
--
--
--	switch (arm_state->vc_suspend_state) {
--	case VC_SUSPEND_REQUESTED:
--		vchiq_log_info(vchiq_susp_log_level, "%s: suspend already "
--			"requested", __func__);
--		break;
--	case VC_SUSPEND_IN_PROGRESS:
--		vchiq_log_info(vchiq_susp_log_level, "%s: suspend already in "
--			"progress", __func__);
--		break;
--
--	default:
--		/* We don't expect to be in other states, so log but continue
--		 * anyway */
--		vchiq_log_error(vchiq_susp_log_level,
--			"%s unexpected suspend state %s", __func__,
--			suspend_state_names[arm_state->vc_suspend_state +
--						VC_SUSPEND_NUM_OFFSET]);
--		/* fall through */
--	case VC_SUSPEND_REJECTED:
--	case VC_SUSPEND_FAILED:
--		INIT_COMPLETION(arm_state->vc_suspend_complete);
--		/* fall through */
--	case VC_SUSPEND_IDLE:
--		vchiq_log_info(vchiq_susp_log_level,
--			"%s: suspending", __func__);
--		set_suspend_state(arm_state, VC_SUSPEND_REQUESTED);
--		/* kick the slot handler thread to initiate suspend */
--		request_poll(state, NULL, 0);
--		break;
--	}
--
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit %d", __func__, status);
--	return status;
--}
--
--void
--vchiq_platform_check_suspend(VCHIQ_STATE_T *state)
--{
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	int susp = 0;
--
--	if (!arm_state)
--		goto out;
--
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--
--	write_lock_bh(&arm_state->susp_res_lock);
--	if (arm_state->vc_suspend_state == VC_SUSPEND_REQUESTED &&
--			arm_state->vc_resume_state == VC_RESUME_RESUMED) {
--		set_suspend_state(arm_state, VC_SUSPEND_IN_PROGRESS);
--		susp = 1;
--	}
--	write_unlock_bh(&arm_state->susp_res_lock);
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
- 
--	if (susp)
--		vchiq_platform_suspend(state);
-+   if (state->conn_state != VCHIQ_CONNSTATE_CONNECTED)
-+      return VCHIQ_ERROR;
- 
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit", __func__);
--	return;
-+   if(arm_state->suspend_pending)
-+   {
-+      vcos_mutex_lock(&arm_state->suspend_resume_mutex);
-+      if(arm_state->videocore_suspended)
-+      {
-+         vcos_log_info("%s - already suspended", __func__);
-+      }
-+      else
-+      {
-+         vcos_log_info("%s - suspending", __func__);
-+
-+         status = vchiq_platform_suspend(state);
-+         arm_state->videocore_suspended = (status == VCHIQ_SUCCESS) ? 1 : 0;
-+
-+         vcos_mutex_unlock(&arm_state->suspend_resume_mutex);
-+
-+         vcos_mutex_lock(&arm_state->use_count_mutex);
-+         if(!arm_state->suspend_pending)
-+         { /* Something has changed the suspend_pending state while we were suspending.
-+            Run the HP task to check if we need to resume */
-+            vcos_log_info( "%s trigger HP task to check resume", __func__);
-+            vcos_event_signal(&arm_state->hp_evt);
-+         }
-+         arm_state->suspend_pending = 0;
-+         vcos_mutex_unlock(&arm_state->use_count_mutex);
-+      }
-+   }
-+   else
-+   {
-+      vchiq_check_resume(state);
-+   }
-+   return status;
- }
- 
- 
--
--/* Try to get videocore into suspended state, regardless of autosuspend state.
--** We don't actually force suspend, since videocore may get into a bad state
--** if we force suspend at a bad time.  Instead, we wait for autosuspend to
--** determine a good point to suspend.  If this doesn't happen within 100ms we
--** report failure.
--**
--** Returns VCHIQ_SUCCESS if videocore suspended successfully, VCHIQ_RETRY if
--** videocore failed to suspend in time or VCHIQ_ERROR if interrupted.
--*/
- VCHIQ_STATUS_T
--vchiq_arm_force_suspend(VCHIQ_STATE_T *state)
--{
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	VCHIQ_STATUS_T status = VCHIQ_ERROR;
--	long rc = 0;
--	int repeat = -1;
--	static int autosuspend_override;
--
--	if (!arm_state)
--		goto out;
--
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--
--	write_lock_bh(&arm_state->susp_res_lock);
--
--	status = block_resume(arm_state);
--	if (status != VCHIQ_SUCCESS)
--		goto unlock;
--	if (arm_state->vc_suspend_state == VC_SUSPEND_SUSPENDED) {
--			/* Already suspended - just block resume and exit */
--			vchiq_log_info(vchiq_susp_log_level, "%s already "
--				"suspended", __func__);
--			status = VCHIQ_SUCCESS;
--			goto unlock;
--	} else if (arm_state->vc_suspend_state <= VC_SUSPEND_IDLE) {
--		/* initiate suspend immediately in the case that we're waiting
--		 * for the timeout */
--		stop_suspend_timer(arm_state);
--		if (!vchiq_videocore_wanted(state)) {
--			vchiq_log_info(vchiq_susp_log_level, "%s videocore "
--				"idle, initiating suspend", __func__);
--			status = vchiq_arm_vcsuspend(state);
--		} else if (autosuspend_override < FORCE_SUSPEND_FAIL_MAX) {
--			vchiq_log_info(vchiq_susp_log_level, "%s letting "
--				"videocore go idle", __func__);
--			status = VCHIQ_SUCCESS;
--		} else {
--			vchiq_log_warning(vchiq_susp_log_level, "%s failed too "
--				"many times - no more Mr Nice Guy... "
--				"initiating suspend", __func__);
--			status = vchiq_arm_vcsuspend(state);
--		}
--	} else {
--		vchiq_log_info(vchiq_susp_log_level, "%s videocore suspend "
--			"in progress - wait for completion", __func__);
--		status = VCHIQ_SUCCESS;
--	}
--
--	/* Wait for suspend to happen due to system idle (not forced..) */
--	if (status == VCHIQ_SUCCESS) {
--		do {
--			write_unlock_bh(&arm_state->susp_res_lock);
--
--			rc = wait_for_completion_interruptible_timeout(
--				&arm_state->vc_suspend_complete,
--				msecs_to_jiffies(FORCE_SUSPEND_TIMEOUT_MS));
--
--			write_lock_bh(&arm_state->susp_res_lock);
--			if (rc < 0) {
--				vchiq_log_warning(vchiq_susp_log_level, "%s "
--					"interrupted waiting for suspend",
--					__func__);
--				status = VCHIQ_ERROR;
--				goto unblock_resume;
--			} else if (rc == 0) {
--				if (arm_state->vc_suspend_state >
--							VC_SUSPEND_IDLE) {
--					/* Repeat timeout once if in progress */
--					if (repeat < 0) {
--						repeat = 1;
--						continue;
--					}
--				}
--				autosuspend_override++;
--				vchiq_log_warning(vchiq_susp_log_level,
--					"%s timed out waiting for vc suspend "
--					"(%d)", __func__, autosuspend_override);
--				status = VCHIQ_RETRY;
--				goto unblock_resume;
--			}
--		} while (0 < (repeat--));
--	} else
--		goto unblock_resume;
--
--	/* Check and report state in case we need to abort ARM suspend */
--	if (arm_state->vc_suspend_state != VC_SUSPEND_SUSPENDED) {
--		status = VCHIQ_RETRY;
--		vchiq_log_error(vchiq_susp_log_level,
--			"%s videocore suspend failed (state %s)", __func__,
--			suspend_state_names[arm_state->vc_suspend_state +
--						VC_SUSPEND_NUM_OFFSET]);
--		/* Reset the state only if it's still in an error state.
--		 * Something could have already initiated another suspend. */
--		if (arm_state->vc_suspend_state < VC_SUSPEND_IDLE)
--			set_suspend_state(arm_state, VC_SUSPEND_IDLE);
--
--		goto unblock_resume;
--	}
--
--	/* successfully suspended - reset override counter, unlock and exit */
--	autosuspend_override = 0;
--	goto unlock;
--
--unblock_resume:
--	/* all error states need to unblock resume before exit */
--	unblock_resume(arm_state);
--
--unlock:
--	write_unlock_bh(&arm_state->susp_res_lock);
--
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit %d", __func__, status);
--	return status;
--}
--
--void
--vchiq_check_suspend(VCHIQ_STATE_T *state)
--{
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--
--	if (!arm_state)
--		goto out;
--
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--
--	write_lock_bh(&arm_state->susp_res_lock);
--	if (arm_state->vc_suspend_state != VC_SUSPEND_SUSPENDED &&
--			arm_state->first_connect &&
--			!vchiq_videocore_wanted(state)) {
--		vchiq_arm_vcsuspend(state);
--	}
--	write_unlock_bh(&arm_state->susp_res_lock);
--
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit", __func__);
--	return;
--}
--
--
--int
--vchiq_arm_allow_resume(VCHIQ_STATE_T *state)
-+vchiq_arm_vcresume(VCHIQ_STATE_T *state)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	int resume = 0;
--	int ret = -1;
--
--	if (!arm_state)
--		goto out;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+   vcos_mutex_lock(&arm_state->suspend_resume_mutex);
- 
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
-+   status = vchiq_platform_resume(state);
-+   arm_state->videocore_suspended = (status == VCHIQ_RETRY) ? 1 : 0;
- 
--	write_lock_bh(&arm_state->susp_res_lock);
--	unblock_resume(arm_state);
--	resume = vchiq_check_resume(state);
--	write_unlock_bh(&arm_state->susp_res_lock);
-+   vcos_mutex_unlock(&arm_state->suspend_resume_mutex);
- 
--	if (resume) {
--		wait_for_completion_interruptible(
--					&arm_state->vc_resume_complete);
--	}
--
--	read_lock_bh(&arm_state->susp_res_lock);
--	if (arm_state->vc_suspend_state == VC_SUSPEND_SUSPENDED) {
--		vchiq_log_info(vchiq_susp_log_level,
--				"%s: Videocore remains suspended", __func__);
--	} else {
--		vchiq_log_info(vchiq_susp_log_level,
--				"%s: Videocore resumed", __func__);
--		ret = 0;
--	}
--	read_unlock_bh(&arm_state->susp_res_lock);
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit %d", __func__, ret);
--	return ret;
-+   return status;
- }
- 
--/* This function should be called with the write lock held */
--int
--vchiq_check_resume(VCHIQ_STATE_T *state)
-+void
-+vchiq_check_resume(VCHIQ_STATE_T* state)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	int resume = 0;
--
--	if (!arm_state)
--		goto out;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+   vcos_mutex_lock(&arm_state->use_count_mutex);
- 
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
-+   if (arm_state->videocore_suspended && vchiq_videocore_wanted(state))
-+   { /* signal high priority task to resume vc */
-+      vcos_event_signal(&arm_state->hp_evt);
-+   }
- 
--	if (need_resume(state)) {
--		set_resume_state(arm_state, VC_RESUME_REQUESTED);
--		request_poll(state, NULL, 0);
--		resume = 1;
--	}
--
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit", __func__);
--	return resume;
-+   vcos_mutex_unlock(&arm_state->use_count_mutex);
- }
- 
- void
--vchiq_platform_check_resume(VCHIQ_STATE_T *state)
-+vchiq_check_suspend(VCHIQ_STATE_T* state)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	int res = 0;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
- 
--	if (!arm_state)
--		goto out;
-+   vcos_mutex_lock(&arm_state->use_count_mutex);
- 
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--
--	write_lock_bh(&arm_state->susp_res_lock);
--	if (arm_state->wake_address == 0) {
--		vchiq_log_info(vchiq_susp_log_level,
--					"%s: already awake", __func__);
--		goto unlock;
--	}
--	if (arm_state->vc_resume_state == VC_RESUME_IN_PROGRESS) {
--		vchiq_log_info(vchiq_susp_log_level,
--					"%s: already resuming", __func__);
--		goto unlock;
--	}
--
--	if (arm_state->vc_resume_state == VC_RESUME_REQUESTED) {
--		set_resume_state(arm_state, VC_RESUME_IN_PROGRESS);
--		res = 1;
--	} else
--		vchiq_log_trace(vchiq_susp_log_level,
--				"%s: not resuming (resume state %s)", __func__,
--				resume_state_names[arm_state->vc_resume_state +
--							VC_RESUME_NUM_OFFSET]);
--
--unlock:
--	write_unlock_bh(&arm_state->susp_res_lock);
--
--	if (res)
--		vchiq_platform_resume(state);
--
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit", __func__);
--	return;
-+   if (!arm_state->videocore_suspended && !vchiq_videocore_wanted(state))
-+   { /* signal low priority task to suspend vc */
-+      vcos_event_signal(&arm_state->lp_evt);
-+   }
- 
-+   vcos_mutex_unlock(&arm_state->use_count_mutex);
- }
- 
- 
- 
--VCHIQ_STATUS_T
--vchiq_use_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
--		enum USE_TYPE_E use_type)
-+static VCHIQ_STATUS_T
-+vchiq_use_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int block_while_resume)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
--	char entity[16];
--	int *entity_uc;
--	int local_uc, local_entity_uc;
--
--	if (!arm_state)
--		goto out;
--
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--
--	if (use_type != USE_TYPE_SERVICE) {
--		sprintf(entity, "PEER:   ");
--		entity_uc = &arm_state->peer_use_count;
--	} else if (service) {
--		sprintf(entity, "%c%c%c%c:%03d",
--			VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
--			service->client_id);
--		entity_uc = &service->service_use_count;
--	} else {
--		vchiq_log_error(vchiq_susp_log_level, "%s null service "
--				"ptr", __func__);
--		ret = VCHIQ_ERROR;
--		goto out;
--	}
--
--	write_lock_bh(&arm_state->susp_res_lock);
--	while (arm_state->resume_blocked) {
--		/* If we call 'use' while force suspend is waiting for suspend,
--		 * then we're about to block the thread which the force is
--		 * waiting to complete, so we're bound to just time out. In this
--		 * case, set the suspend state such that the wait will be
--		 * canceled, so we can complete as quickly as possible. */
--		if (arm_state->resume_blocked && arm_state->vc_suspend_state ==
--				VC_SUSPEND_IDLE) {
--			set_suspend_state(arm_state, VC_SUSPEND_FORCE_CANCELED);
--			break;
--		}
--		/* If suspend is already in progress then we need to block */
--		if (!try_wait_for_completion(&arm_state->resume_blocker)) {
--			/* Indicate that there are threads waiting on the resume
--			 * blocker.  These need to be allowed to complete before
--			 * a _second_ call to force suspend can complete,
--			 * otherwise low priority threads might never actually
--			 * continue */
--			arm_state->blocked_count++;
--			write_unlock_bh(&arm_state->susp_res_lock);
--			vchiq_log_info(vchiq_susp_log_level, "%s %s resume "
--				"blocked - waiting...", __func__, entity);
--			if (wait_for_completion_killable(
--					&arm_state->resume_blocker) != 0) {
--				vchiq_log_error(vchiq_susp_log_level, "%s %s "
--					"wait for resume blocker interrupted",
--					__func__, entity);
--				ret = VCHIQ_ERROR;
--				write_lock_bh(&arm_state->susp_res_lock);
--				arm_state->blocked_count--;
--				write_unlock_bh(&arm_state->susp_res_lock);
--				goto out;
--			}
--			vchiq_log_info(vchiq_susp_log_level, "%s %s resume "
--				"unblocked", __func__, entity);
--			write_lock_bh(&arm_state->susp_res_lock);
--			if (--arm_state->blocked_count == 0)
--				complete_all(&arm_state->blocked_blocker);
--		}
--	}
--
--	stop_suspend_timer(arm_state);
--	write_unlock_bh(&arm_state->susp_res_lock);
--
--	mutex_lock(&arm_state->vc_use_cnt_mutex);
--	if (!arm_state->videocore_use_count)
--		pm_qos_add_request(&arm_state->qos_request,
--					PM_QOS_CPU_DMA_LATENCY, 100);
--
--	local_uc = ++arm_state->videocore_use_count;
--	local_entity_uc = ++(*entity_uc);
--	mutex_unlock(&arm_state->vc_use_cnt_mutex);
--
--	write_lock_bh(&arm_state->susp_res_lock);
--
--	/* If there's a pending request which hasn't yet been serviced then
--	 * just clear it.  If we're past VC_SUSPEND_REQUESTED state then
--	 * vc_resume_complete will block until we either resume or fail to
--	 * suspend */
--	if (arm_state->vc_suspend_state <= VC_SUSPEND_REQUESTED)
--		set_suspend_state(arm_state, VC_SUSPEND_IDLE);
--
--	if (need_resume(state)) {
--		set_resume_state(arm_state, VC_RESUME_REQUESTED);
--		vchiq_log_info(vchiq_susp_log_level,
--			"%s %s count %d, state count %d",
--			__func__, entity, local_entity_uc, local_uc);
--		request_poll(state, NULL, 0);
--	} else
--		vchiq_log_trace(vchiq_susp_log_level,
--			"%s %s count %d, state count %d",
--			__func__, entity, *entity_uc, local_uc);
--
--
--	write_unlock_bh(&arm_state->susp_res_lock);
--
--	/* Completion is in a done state when we're not suspended, so this won't
--	 * block for the non-suspended case. */
--	if (!try_wait_for_completion(&arm_state->vc_resume_complete)) {
--		vchiq_log_info(vchiq_susp_log_level, "%s %s wait for resume",
--			__func__, entity);
--		if (wait_for_completion_killable(
--				&arm_state->vc_resume_complete) != 0) {
--			vchiq_log_error(vchiq_susp_log_level, "%s %s wait for "
--				"resume interrupted", __func__, entity);
--			ret = VCHIQ_ERROR;
--			goto out;
--		}
--		vchiq_log_info(vchiq_susp_log_level, "%s %s resumed", __func__,
--			entity);
--	}
--
--	if (ret == VCHIQ_SUCCESS) {
--		VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
--		long ack_cnt = atomic_xchg(&arm_state->ka_use_ack_count, 0);
--		while (ack_cnt && (status == VCHIQ_SUCCESS)) {
--			/* Send the use notify to videocore */
--			status = vchiq_send_remote_use_active(state);
--			if (status == VCHIQ_SUCCESS)
--				ack_cnt--;
--			else
--				atomic_add(ack_cnt,
--					&arm_state->ka_use_ack_count);
--		}
--	}
--
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit %d", __func__, ret);
--	return ret;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+   VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
-+   char entity[10];
-+   int* entity_uc;
-+
-+   if(arm_state)
-+   {
-+      vcos_mutex_lock(&arm_state->use_count_mutex);
-+
-+      if (service)
-+      {
-+         sprintf(entity, "%c%c%c%c:%03d",VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc), service->client_id);
-+         entity_uc = &service->service_use_count;
-+      }
-+      else
-+      {
-+         sprintf(entity, "PEER:   ");
-+         entity_uc = &arm_state->peer_use_count;
-+      }
-+
-+      if (!arm_state->videocore_suspended && !vchiq_videocore_wanted(state))
-+      {
-+#if VCOS_HAVE_TIMER
-+         if (vchiq_platform_use_suspend_timer())
-+         {
-+            vcos_log_trace( "%s %s - cancel suspend timer", __func__, entity);
-+         }
-+         vcos_timer_cancel(&g_suspend_timer);
-+#endif
-+      }
-+
-+      arm_state->videocore_use_count++;
-+      (*entity_uc)++;
-+      arm_state->suspend_pending = 0;
-+
-+      if (arm_state->videocore_suspended && vchiq_videocore_wanted(state))
-+      {
-+         vcos_log_info( "%s %s count %d, state count %d", __func__, entity, *entity_uc, arm_state->videocore_use_count);
-+         if(block_while_resume)
-+         {
-+            ret = vchiq_arm_vcresume(state);
-+         }
-+         else
-+         {
-+            vcos_log_info( "%s trigger HP task to do resume", __func__); /* triggering is done below */
-+         }
-+      }
-+      else
-+      {
-+         vcos_log_trace( "%s %s count %d, state count %d", __func__, entity, *entity_uc, arm_state->videocore_use_count);
-+      }
-+      if(!block_while_resume)
-+      {
-+         arm_state->use_notify_pending++;
-+         vcos_event_signal(&arm_state->hp_evt); /* hp task will check if we need to resume and also send use notify */
-+      }
-+
-+      if (ret == VCHIQ_RETRY)
-+      { /* if we're told to retry, decrement the counters.  VCHIQ_ERROR probably means we're already resumed. */
-+         (*entity_uc)--;
-+         arm_state->videocore_use_count--;
-+      }
-+
-+      vcos_mutex_unlock(&arm_state->use_count_mutex);
-+   }
-+   return ret;
- }
- 
--VCHIQ_STATUS_T
-+static VCHIQ_STATUS_T
- vchiq_release_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
--	char entity[16];
--	int *entity_uc;
--	int local_uc, local_entity_uc;
--
--	if (!arm_state)
--		goto out;
--
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--
--	if (service) {
--		sprintf(entity, "%c%c%c%c:%03d",
--			VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
--			service->client_id);
--		entity_uc = &service->service_use_count;
--	} else {
--		sprintf(entity, "PEER:   ");
--		entity_uc = &arm_state->peer_use_count;
--	}
--
--	write_lock_bh(&arm_state->susp_res_lock);
--	if (!arm_state->videocore_use_count || !(*entity_uc)) {
--		/* Don't use BUG_ON - don't allow user thread to crash kernel */
--		WARN_ON(!arm_state->videocore_use_count);
--		WARN_ON(!(*entity_uc));
--		ret = VCHIQ_ERROR;
--		goto unlock;
--	}
--	write_unlock_bh(&arm_state->susp_res_lock);
--
--	mutex_lock(&arm_state->vc_use_cnt_mutex);
--	local_uc = --arm_state->videocore_use_count;
--	local_entity_uc = --(*entity_uc);
--
--	if (!arm_state->videocore_use_count)
--		pm_qos_remove_request(&arm_state->qos_request);
--	mutex_unlock(&arm_state->vc_use_cnt_mutex);
--
--	write_lock_bh(&arm_state->susp_res_lock);
--	if (!vchiq_videocore_wanted(state)) {
--		if (vchiq_platform_use_suspend_timer() &&
--				!arm_state->resume_blocked) {
--			/* Only use the timer if we're not trying to force
--			 * suspend (=> resume_blocked) */
--			start_suspend_timer(arm_state);
--		} else {
--			vchiq_log_info(vchiq_susp_log_level,
--				"%s %s count %d, state count %d - suspending",
--				__func__, entity, *entity_uc,
--				arm_state->videocore_use_count);
--			vchiq_arm_vcsuspend(state);
--		}
--	} else
--		vchiq_log_trace(vchiq_susp_log_level,
--			"%s %s count %d, state count %d",
--			__func__, entity, *entity_uc,
--			arm_state->videocore_use_count);
--
--unlock:
--	write_unlock_bh(&arm_state->susp_res_lock);
--
--out:
--	vchiq_log_trace(vchiq_susp_log_level, "%s exit %d", __func__, ret);
--	return ret;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+   VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
-+   char entity[10];
-+   int* entity_uc;
-+
-+   if(arm_state)
-+   {
-+      vcos_mutex_lock(&arm_state->use_count_mutex);
-+
-+      if (service)
-+      {
-+         sprintf(entity, "%c%c%c%c:%03d",VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc), service->client_id);
-+         entity_uc = &service->service_use_count;
-+      }
-+      else
-+      {
-+         sprintf(entity, "PEER:   ");
-+         entity_uc = &arm_state->peer_use_count;
-+      }
-+
-+      if (*entity_uc && arm_state->videocore_use_count)
-+      {
-+         arm_state->videocore_use_count--;
-+         (*entity_uc)--;
-+
-+         if (!vchiq_videocore_wanted(state))
-+         {
-+#if VCOS_HAVE_TIMER
-+            if (vchiq_platform_use_suspend_timer())
-+            {
-+               vcos_log_trace( "%s %s count %d, state count %d - starting suspend timer", __func__, entity, *entity_uc, arm_state->videocore_use_count);
-+               vcos_timer_cancel(&g_suspend_timer);
-+               vcos_timer_set(&g_suspend_timer, SUSPEND_TIMER_TIMEOUT_MS);
-+            }
-+            else
-+#endif
-+            {
-+               vcos_log_info( "%s %s count %d, state count %d - suspend pending", __func__, entity, *entity_uc, arm_state->videocore_use_count);
-+               vcos_event_signal(&arm_state->lp_evt); /* kick the lp thread to do the suspend */
-+            }
-+         }
-+         else
-+         {
-+            vcos_log_trace( "%s %s count %d, state count %d", __func__, entity, *entity_uc, arm_state->videocore_use_count);
-+         }
-+      }
-+      else
-+      {
-+         vcos_log_error( "%s %s ERROR releasing service; count %d, state count %d", __func__, entity, *entity_uc, arm_state->videocore_use_count);
-+         ret = VCHIQ_ERROR;
-+      }
-+
-+      vcos_mutex_unlock(&arm_state->use_count_mutex);
-+   }
-+   return ret;
- }
- 
--void
-+VCHIQ_STATUS_T
- vchiq_on_remote_use(VCHIQ_STATE_T *state)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--	atomic_inc(&arm_state->ka_use_count);
--	complete(&arm_state->ka_evt);
-+   vcos_log_info("%s state %p", __func__, state);
-+   return state ? vchiq_use_internal(state, NULL, 0) : VCHIQ_ERROR;
- }
- 
--void
-+VCHIQ_STATUS_T
- vchiq_on_remote_release(VCHIQ_STATE_T *state)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--	atomic_inc(&arm_state->ka_release_count);
--	complete(&arm_state->ka_evt);
-+   vcos_log_info("%s state %p", __func__, state);
-+   return state ? vchiq_release_internal(state, NULL) : VCHIQ_ERROR;
- }
- 
- VCHIQ_STATUS_T
- vchiq_use_service_internal(VCHIQ_SERVICE_T *service)
- {
--	return vchiq_use_internal(service->state, service, USE_TYPE_SERVICE);
-+   VCHIQ_STATE_T* state = NULL;
-+
-+   if (service)
-+   {
-+      state = service->state;
-+   }
-+
-+   if (!service || !state)
-+   {
-+      return VCHIQ_ERROR;
-+   }
-+   return vchiq_use_internal(state, service, 1);
- }
- 
- VCHIQ_STATUS_T
- vchiq_release_service_internal(VCHIQ_SERVICE_T *service)
- {
--	return vchiq_release_internal(service->state, service);
-+   VCHIQ_STATE_T* state = NULL;
-+
-+   if (service)
-+   {
-+      state = service->state;
-+   }
-+
-+   if (!service || !state)
-+   {
-+      return VCHIQ_ERROR;
-+   }
-+   return vchiq_release_internal(state, service);
- }
- 
--static void suspend_timer_callback(unsigned long context)
-+
-+#if VCOS_HAVE_TIMER
-+static void suspend_timer_callback(void* context)
- {
--	VCHIQ_STATE_T *state = (VCHIQ_STATE_T *)context;
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	if (!arm_state)
--		goto out;
--	vchiq_log_info(vchiq_susp_log_level,
--		"%s - suspend timer expired - check suspend", __func__);
--	vchiq_check_suspend(state);
--out:
--	return;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state((VCHIQ_STATE_T*)context);
-+   vcos_log_info( "%s - suspend pending", __func__);
-+   vcos_event_signal(&arm_state->lp_evt);
- }
-+#endif
- 
- VCHIQ_STATUS_T
- vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
- {
--	VCHIQ_STATUS_T ret = VCHIQ_ERROR;
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	if (service) {
--		ret = vchiq_use_internal(service->state, service,
--				USE_TYPE_SERVICE);
--		unlock_service(service);
--	}
--	return ret;
-+   VCHIQ_STATUS_T ret = VCHIQ_ERROR;
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *) handle;
-+   if (service)
-+   {
-+      ret = vchiq_use_service_internal(service);
-+   }
-+   return ret;
- }
- 
- VCHIQ_STATUS_T
- vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle)
- {
--	VCHIQ_STATUS_T ret = VCHIQ_ERROR;
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	if (service) {
--		ret = vchiq_release_internal(service->state, service);
--		unlock_service(service);
--	}
--	return ret;
-+   VCHIQ_STATUS_T ret = VCHIQ_ERROR;
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *) handle;
-+   if (service)
-+   {
-+      ret = vchiq_release_service_internal(service);
-+   }
-+   return ret;
- }
- 
- void
- vchiq_dump_service_use_state(VCHIQ_STATE_T *state)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	int i, j = 0;
--	/* Only dump 64 services */
--	static const int local_max_services = 64;
--	/* If there's more than 64 services, only dump ones with
--	 * non-zero counts */
--	int only_nonzero = 0;
--	static const char *nz = "<-- preventing suspend";
--
--	enum vc_suspend_status vc_suspend_state;
--	enum vc_resume_status  vc_resume_state;
--	int peer_count;
--	int vc_use_count;
--	int active_services;
--	struct service_data_struct {
--		int fourcc;
--		int clientid;
--		int use_count;
--	} service_data[local_max_services];
--
--	if (!arm_state)
--		return;
--
--	read_lock_bh(&arm_state->susp_res_lock);
--	vc_suspend_state = arm_state->vc_suspend_state;
--	vc_resume_state  = arm_state->vc_resume_state;
--	peer_count = arm_state->peer_use_count;
--	vc_use_count = arm_state->videocore_use_count;
--	active_services = state->unused_service;
--	if (active_services > local_max_services)
--		only_nonzero = 1;
--
--	for (i = 0; (i < active_services) && (j < local_max_services); i++) {
--		VCHIQ_SERVICE_T *service_ptr = state->services[i];
--		if (!service_ptr)
--			continue;
--
--		if (only_nonzero && !service_ptr->service_use_count)
--			continue;
--
--		if (service_ptr->srvstate != VCHIQ_SRVSTATE_FREE) {
--			service_data[j].fourcc = service_ptr->base.fourcc;
--			service_data[j].clientid = service_ptr->client_id;
--			service_data[j++].use_count = service_ptr->
--							service_use_count;
--		}
--	}
--
--	read_unlock_bh(&arm_state->susp_res_lock);
--
--	vchiq_log_warning(vchiq_susp_log_level,
--		"-- Videcore suspend state: %s --",
--		suspend_state_names[vc_suspend_state + VC_SUSPEND_NUM_OFFSET]);
--	vchiq_log_warning(vchiq_susp_log_level,
--		"-- Videcore resume state: %s --",
--		resume_state_names[vc_resume_state + VC_RESUME_NUM_OFFSET]);
--
--	if (only_nonzero)
--		vchiq_log_warning(vchiq_susp_log_level, "Too many active "
--			"services (%d).  Only dumping up to first %d services "
--			"with non-zero use-count", active_services,
--			local_max_services);
--
--	for (i = 0; i < j; i++) {
--		vchiq_log_error(vchiq_arm_log_level,
--			"----- %c%c%c%c:%d service count %d %s",
--			VCHIQ_FOURCC_AS_4CHARS(service_data[i].fourcc),
--			service_data[i].clientid,
--			service_data[i].use_count,
--			service_data[i].use_count ? nz : "");
--	}
--	vchiq_log_warning(vchiq_susp_log_level,
--		"----- PEER use count count %d", peer_count);
--	vchiq_log_warning(vchiq_susp_log_level,
--		"--- Overall vchiq instance use count %d", vc_use_count);
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-+   int i;
-+   if(arm_state)
-+   {
-+      vcos_mutex_lock(&arm_state->suspend_resume_mutex);
-+      if (arm_state->videocore_suspended)
-+      {
-+         vcos_log_warn("--VIDEOCORE SUSPENDED--");
-+      }
-+      else
-+      {
-+         vcos_log_warn("--VIDEOCORE AWAKE--");
-+      }
-+      for (i = 0; i < state->unused_service; i++) {
-+         VCHIQ_SERVICE_T *service_ptr = state->services[i];
-+         if (service_ptr && (service_ptr->srvstate != VCHIQ_SRVSTATE_FREE))
-+         {
-+            if (service_ptr->service_use_count)
-+               vcos_log_error("----- %c%c%c%c:%d service count %d <-- preventing suspend", VCHIQ_FOURCC_AS_4CHARS(service_ptr->base.fourcc), service_ptr->client_id, service_ptr->service_use_count);
-+            else
-+               vcos_log_warn("----- %c%c%c%c:%d service count 0", VCHIQ_FOURCC_AS_4CHARS(service_ptr->base.fourcc), service_ptr->client_id);
-+         }
-+      }
-+      vcos_log_warn("----- PEER use count count %d", arm_state->peer_use_count);
-+      vcos_log_warn("--- Overall vchiq instance use count %d", arm_state->videocore_use_count);
-+
-+      vchiq_dump_platform_use_state(state);
- 
--	vchiq_dump_platform_use_state(state);
-+      vcos_mutex_unlock(&arm_state->suspend_resume_mutex);
-+   }
- }
- 
- VCHIQ_STATUS_T
--vchiq_check_service(VCHIQ_SERVICE_T *service)
-+vchiq_check_service(VCHIQ_SERVICE_T * service)
- {
--	VCHIQ_ARM_STATE_T *arm_state =
--		vchiq_platform_get_arm_state(service->state);
--	VCHIQ_STATUS_T ret = VCHIQ_ERROR;
--
--	if (!arm_state || !service)
--		goto out;
--
--	vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
--
--	read_lock_bh(&arm_state->susp_res_lock);
--	if (service->service_use_count)
--		ret = VCHIQ_SUCCESS;
--	read_unlock_bh(&arm_state->susp_res_lock);
--
--	if (ret == VCHIQ_ERROR) {
--		vchiq_log_error(vchiq_susp_log_level,
--			"%s ERROR - %c%c%c%c:%d service count %d, "
--			"state count %d, videocore suspend state %s", __func__,
--			VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
--			service->client_id, service->service_use_count,
--			arm_state->videocore_use_count,
--			suspend_state_names[arm_state->vc_suspend_state +
--						VC_SUSPEND_NUM_OFFSET]);
--		vchiq_dump_service_use_state(service->state);
--	}
--out:
--	return ret;
-+   VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(service->state);
-+   VCHIQ_STATUS_T ret = VCHIQ_ERROR;
-+   /* on 2835 vchiq does not have an arm_state */
-+   if (!arm_state)
-+      return VCHIQ_SUCCESS;
-+   if (service && arm_state)
-+   {
-+      vcos_mutex_lock(&arm_state->use_count_mutex);
-+      if (!service->service_use_count)
-+      {
-+         vcos_log_error( "%s ERROR - %c%c%c%c:%d service count %d, state count %d, videocore_suspended %d", __func__,VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc), service->client_id, service->service_use_count, arm_state->videocore_use_count, arm_state->videocore_suspended);
-+         vchiq_dump_service_use_state(service->state);
-+         vcos_assert(0); // vcos_assert should kill the calling thread, so a user thread shouldn't be able to kill the kernel.
-+      }
-+      else
-+      {
-+         ret = VCHIQ_SUCCESS;
-+      }
-+      vcos_mutex_unlock(&arm_state->use_count_mutex);
-+   }
-+   return ret;
- }
- 
- /* stub functions */
- void vchiq_on_remote_use_active(VCHIQ_STATE_T *state)
- {
--	(void)state;
-+   vcos_unused(state);
- }
- 
--void vchiq_platform_conn_state_changed(VCHIQ_STATE_T *state,
--	VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate)
-+void vchiq_platform_conn_state_changed(VCHIQ_STATE_T *state, VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate)
- {
--	VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
--	vchiq_log_info(vchiq_susp_log_level, "%d: %s->%s", state->id,
--		get_conn_state_name(oldstate), get_conn_state_name(newstate));
--	if (state->conn_state == VCHIQ_CONNSTATE_CONNECTED) {
--		write_lock_bh(&arm_state->susp_res_lock);
--		if (!arm_state->first_connect) {
--			arm_state->first_connect = 1;
--			write_unlock_bh(&arm_state->susp_res_lock);
--			wake_up_process(arm_state->ka_thread);
--		} else
--			write_unlock_bh(&arm_state->susp_res_lock);
--	}
-+   vcos_unused(state);
-+   vcos_unused(oldstate);
-+   vcos_unused(oldstate);
- }
- 
- 
-@@ -2592,132 +1828,67 @@
- static int __init
- vchiq_init(void)
- {
--	int err;
--	void *ptr_err;
-+   int err;
-+   void *ptr_err;
- 
--	/* create proc entries */
--	err = vchiq_proc_init();
--	if (err != 0)
--		goto failed_proc_init;
--
--	err = alloc_chrdev_region(&vchiq_devid, VCHIQ_MINOR, 1, DEVICE_NAME);
--	if (err != 0) {
--		vchiq_log_error(vchiq_arm_log_level,
--			"Unable to allocate device number");
--		goto failed_alloc_chrdev;
--	}
--	cdev_init(&vchiq_cdev, &vchiq_fops);
--	vchiq_cdev.owner = THIS_MODULE;
--	err = cdev_add(&vchiq_cdev, vchiq_devid, 1);
--	if (err != 0) {
--		vchiq_log_error(vchiq_arm_log_level,
--			"Unable to register device");
--		goto failed_cdev_add;
--	}
--
--	/* create sysfs entries */
--	vchiq_class = class_create(THIS_MODULE, DEVICE_NAME);
--	ptr_err = vchiq_class;
--	if (IS_ERR(ptr_err))
--		goto failed_class_create;
--
--	vchiq_dev = device_create(vchiq_class, NULL,
--		vchiq_devid, NULL, "vchiq");
--	ptr_err = vchiq_dev;
--	if (IS_ERR(ptr_err))
--		goto failed_device_create;
--
--	err = vchiq_platform_init(&g_state);
--	if (err != 0)
--		goto failed_platform_init;
--
--	vchiq_log_info(vchiq_arm_log_level,
--		"vchiq: initialised - version %d (min %d), device %d.%d",
--		VCHIQ_VERSION, VCHIQ_VERSION_MIN,
--		MAJOR(vchiq_devid), MINOR(vchiq_devid));
-+   err = vchiq_platform_vcos_init();
-+   if (err != 0)
-+      goto failed_platform_vcos_init;
-+
-+   vcos_log_set_level(VCOS_LOG_CATEGORY, vchiq_default_arm_log_level);
-+   vcos_log_register("vchiq_arm", VCOS_LOG_CATEGORY);
-+
-+   if ((err =
-+        alloc_chrdev_region(&vchiq_devid, VCHIQ_MINOR, 1,
-+             DEVICE_NAME)) != 0) {
-+      vcos_log_error("Unable to allocate device number");
-+      goto failed_alloc_chrdev;
-+   }
-+   cdev_init(&vchiq_cdev, &vchiq_fops);
-+   vchiq_cdev.owner = THIS_MODULE;
-+   if ((err = cdev_add(&vchiq_cdev, vchiq_devid, 1)) != 0) {
-+      vcos_log_error("Unable to register device");
-+      goto failed_cdev_add;
-+   }
-+
-+   /* create sysfs entries */
-+   vchiq_class = class_create(THIS_MODULE, DEVICE_NAME);
-+   if (IS_ERR(ptr_err = vchiq_class))
-+      goto failed_class_create;
-+
-+   vchiq_dev = device_create(vchiq_class, NULL,
-+      vchiq_devid, NULL, "vchiq");
-+   if (IS_ERR(ptr_err = vchiq_dev))
-+      goto failed_device_create;
-+
-+   err = vchiq_platform_init(&g_state);
-+   if (err != 0)
-+      goto failed_platform_init;
-+
-+#if VCOS_HAVE_TIMER
-+   vcos_timer_create( &g_suspend_timer, "suspend_timer", suspend_timer_callback, (void*)(&g_state));
-+#endif
-+
-+   vcos_log_error("vchiq: initialised - version %d (min %d), device %d.%d",
-+      VCHIQ_VERSION, VCHIQ_VERSION_MIN,
-+      MAJOR(vchiq_devid), MINOR(vchiq_devid));
- 
--	return 0;
-+   return 0;
- 
- failed_platform_init:
--	device_destroy(vchiq_class, vchiq_devid);
-+   device_destroy(vchiq_class, vchiq_devid);
- failed_device_create:
--	class_destroy(vchiq_class);
-+   class_destroy(vchiq_class);
- failed_class_create:
--	cdev_del(&vchiq_cdev);
--	err = PTR_ERR(ptr_err);
-+   cdev_del(&vchiq_cdev);
-+   err = PTR_ERR(ptr_err);
- failed_cdev_add:
--	unregister_chrdev_region(vchiq_devid, 1);
-+   unregister_chrdev_region(vchiq_devid, 1);
- failed_alloc_chrdev:
--	vchiq_proc_deinit();
--failed_proc_init:
--	vchiq_log_warning(vchiq_arm_log_level, "could not load vchiq");
--	return err;
-+failed_platform_vcos_init:
-+   printk(KERN_WARNING "could not load vchiq\n");
-+   return err;
- }
--
--static int vchiq_instance_get_use_count(VCHIQ_INSTANCE_T instance)
--{
--	VCHIQ_SERVICE_T *service;
--	int use_count = 0, i;
--	i = 0;
--	while ((service = next_service_by_instance(instance->state,
--		instance, &i)) != NULL) {
--		use_count += service->service_use_count;
--		unlock_service(service);
--	}
--	return use_count;
--}
--
--/* read the per-process use-count */
--static int proc_read_use_count(char *page, char **start,
--			       off_t off, int count,
--			       int *eof, void *data)
--{
--	VCHIQ_INSTANCE_T instance = data;
--	int len, use_count;
--
--	use_count = vchiq_instance_get_use_count(instance);
--	len = snprintf(page+off, count, "%d\n", use_count);
--
--	return len;
--}
--
--/* add an instance (process) to the proc entries */
--static int vchiq_proc_add_instance(VCHIQ_INSTANCE_T instance)
--{
--	char pidstr[32];
--	struct proc_dir_entry *top, *use_count;
--	struct proc_dir_entry *clients = vchiq_clients_top();
--	int pid = instance->pid;
--
--	snprintf(pidstr, sizeof(pidstr), "%d", pid);
--	top = proc_mkdir(pidstr, clients);
--	if (!top)
--		goto fail_top;
--
--	use_count = create_proc_read_entry("use_count",
--					   0444, top,
--					   proc_read_use_count,
--					   instance);
--	if (!use_count)
--		goto fail_use_count;
--
--	instance->proc_entry = top;
--
--	return 0;
--
--fail_use_count:
--	remove_proc_entry(top->name, clients);
--fail_top:
--	return -ENOMEM;
--}
--
--static void vchiq_proc_remove_instance(VCHIQ_INSTANCE_T instance)
--{
--	struct proc_dir_entry *clients = vchiq_clients_top();
--	remove_proc_entry("use_count", instance->proc_entry);
--	remove_proc_entry(instance->proc_entry->name, clients);
--}
--
- /****************************************************************************
- *
- *   vchiq_exit - called when the module is unloaded.
-@@ -2727,11 +1898,12 @@
- static void __exit
- vchiq_exit(void)
- {
--	vchiq_platform_exit(&g_state);
--	device_destroy(vchiq_class, vchiq_devid);
--	class_destroy(vchiq_class);
--	cdev_del(&vchiq_cdev);
--	unregister_chrdev_region(vchiq_devid, 1);
-+   vchiq_platform_exit(&g_state);
-+   device_destroy(vchiq_class, vchiq_devid);
-+   class_destroy(vchiq_class);
-+   cdev_del(&vchiq_cdev);
-+   unregister_chrdev_region(vchiq_devid, 1);
-+   vcos_log_unregister(VCOS_LOG_CATEGORY);
- }
- 
- module_init(vchiq_init);
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h	2012-10-21 15:15:10.007259869 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h	2012-10-17 18:57:47.000000000 +0200
-@@ -19,101 +19,46 @@
- #ifndef VCHIQ_ARM_H
- #define VCHIQ_ARM_H
- 
--#include <linux/mutex.h>
--#include <linux/semaphore.h>
--//#include <linux/pm_qos_params.h>
--#define pm_qos_add_request(a,b,c) do {} while (0)
--#define pm_qos_remove_request(a) do {} while (0)
--struct pm_qos_request_list {int dummy;};
--#include <linux/atomic.h>
- #include "vchiq_core.h"
- 
- 
--enum vc_suspend_status {
--	VC_SUSPEND_FORCE_CANCELED = -3, /* Force suspend canceled, too busy */
--	VC_SUSPEND_REJECTED = -2,  /* Videocore rejected suspend request */
--	VC_SUSPEND_FAILED = -1,    /* Videocore suspend failed */
--	VC_SUSPEND_IDLE = 0,       /* VC active, no suspend actions */
--	VC_SUSPEND_REQUESTED,      /* User has requested suspend */
--	VC_SUSPEND_IN_PROGRESS,    /* Slot handler has recvd suspend request */
--	VC_SUSPEND_SUSPENDED       /* Videocore suspend succeeded */
--};
--
--enum vc_resume_status {
--	VC_RESUME_FAILED = -1, /* Videocore resume failed */
--	VC_RESUME_IDLE = 0,    /* VC suspended, no resume actions */
--	VC_RESUME_REQUESTED,   /* User has requested resume */
--	VC_RESUME_IN_PROGRESS, /* Slot handler has received resume request */
--	VC_RESUME_RESUMED      /* Videocore resumed successfully (active) */
--};
--
--
--enum USE_TYPE_E {
--	USE_TYPE_SERVICE,
--	USE_TYPE_PEER,
--	USE_TYPE_VCHIQ
--};
-+typedef struct vchiq_arm_state_struct {
- 
-+   VCOS_THREAD_T lp_thread;            /* processes low priority messages (eg suspend) */
-+   VCOS_THREAD_T hp_thread;            /* processes high priority messages (eg resume) */
- 
--typedef struct vchiq_arm_state_struct {
--	/* Keepalive-related data */
--	struct task_struct *ka_thread;
--	struct completion ka_evt;
--	atomic_t ka_use_count;
--	atomic_t ka_use_ack_count;
--	atomic_t ka_release_count;
--
--	struct completion vc_suspend_complete;
--	struct completion vc_resume_complete;
--
--	rwlock_t susp_res_lock;
--	enum vc_suspend_status vc_suspend_state;
--	enum vc_resume_status vc_resume_state;
--
--	struct mutex vc_use_cnt_mutex;
--	unsigned int wake_address;
--
--	struct timer_list suspend_timer;
--	int suspend_timer_timeout;
--	int suspend_timer_running;
--
--	/* Global use count for videocore.
--	** This is equal to the sum of the use counts for all services.  When
--	** this hits zero the videocore suspend procedure will be initiated.
--	*/
--	int videocore_use_count;
--
--	/* Use count to track requests from videocore peer.
--	** This use count is not associated with a service, so needs to be
--	** tracked separately with the state.
--	*/
--	int peer_use_count;
--
--	/* Flag to indicate whether resume is blocked.  This happens when the
--	** ARM is suspending
--	*/
--	struct completion resume_blocker;
--	int resume_blocked;
--	struct completion blocked_blocker;
--	int blocked_count;
--
--	/* Flag to indicate that the first vchiq connect has made it through.
--	** This means that both sides should be fully ready, and we should
--	** be able to suspend after this point.
--	*/
--	int first_connect;
--
--	struct pm_qos_request_list qos_request;
--
--	unsigned long long suspend_start_time;
--	unsigned long long sleep_start_time;
--	unsigned long long resume_start_time;
--	unsigned long long last_wake_time;
-+   VCOS_EVENT_T lp_evt;
-+   VCOS_EVENT_T hp_evt;
-+
-+   VCOS_MUTEX_T use_count_mutex;
-+   VCOS_MUTEX_T suspend_resume_mutex;
- 
-+   int suspend_pending;
-+
-+   /* Global use count for videocore.
-+    * This is equal to the sum of the use counts for all services.  When this hits
-+    * zero the videocore suspend procedure will be initiated. */
-+   int videocore_use_count;
-+
-+   /* Use count to track requests from videocore peer.
-+    * This use count is not associated with a service, so needs to be tracked separately
-+    * with the state.
-+    */
-+   int peer_use_count;
-+
-+   /* Flag to indicate whether videocore is currently suspended */
-+   int videocore_suspended;
-+
-+   /* Flag to indicate whether a notification is pending back to videocore that it's
-+    * "remote use request" has been actioned */
-+   int use_notify_pending;
- } VCHIQ_ARM_STATE_T;
- 
--extern int vchiq_arm_log_level;
--extern int vchiq_susp_log_level;
-+
-+extern VCOS_LOG_CAT_T vchiq_arm_log_category;
-+
-+extern int __init
-+vchiq_platform_vcos_init(void);
- 
- extern int __init
- vchiq_platform_init(VCHIQ_STATE_T *state);
-@@ -128,22 +73,16 @@
- vchiq_arm_vcsuspend(VCHIQ_STATE_T *state);
- 
- extern VCHIQ_STATUS_T
--vchiq_arm_force_suspend(VCHIQ_STATE_T *state);
--
--extern int
--vchiq_arm_allow_resume(VCHIQ_STATE_T *state);
--
--extern VCHIQ_STATUS_T
- vchiq_arm_vcresume(VCHIQ_STATE_T *state);
- 
- extern VCHIQ_STATUS_T
- vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state);
- 
--extern int
--vchiq_check_resume(VCHIQ_STATE_T *state);
-+extern void
-+vchiq_check_resume(VCHIQ_STATE_T* state);
- 
- extern void
--vchiq_check_suspend(VCHIQ_STATE_T *state);
-+vchiq_check_suspend(VCHIQ_STATE_T* state);
- 
- extern VCHIQ_STATUS_T
- vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle);
-@@ -152,13 +91,16 @@
- vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle);
- 
- extern VCHIQ_STATUS_T
--vchiq_check_service(VCHIQ_SERVICE_T *service);
-+vchiq_check_service(VCHIQ_SERVICE_T * service);
- 
- extern VCHIQ_STATUS_T
- vchiq_platform_suspend(VCHIQ_STATE_T *state);
- 
-+extern VCHIQ_STATUS_T
-+vchiq_platform_resume(VCHIQ_STATE_T *state);
-+
- extern int
--vchiq_platform_videocore_wanted(VCHIQ_STATE_T *state);
-+vchiq_platform_videocore_wanted(VCHIQ_STATE_T* state);
- 
- extern int
- vchiq_platform_use_suspend_timer(void);
-@@ -172,30 +114,5 @@
- extern VCHIQ_ARM_STATE_T*
- vchiq_platform_get_arm_state(VCHIQ_STATE_T *state);
- 
--extern int
--vchiq_videocore_wanted(VCHIQ_STATE_T *state);
--
--extern VCHIQ_STATUS_T
--vchiq_use_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
--		enum USE_TYPE_E use_type);
--extern VCHIQ_STATUS_T
--vchiq_release_internal(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service);
--
--void
--set_suspend_state(VCHIQ_ARM_STATE_T *arm_state,
--	enum vc_suspend_status new_state);
--
--void
--set_resume_state(VCHIQ_ARM_STATE_T *arm_state,
--	enum vc_resume_status new_state);
--
--void
--start_suspend_timer(VCHIQ_ARM_STATE_T *arm_state);
--
--extern int vchiq_proc_init(void);
--extern void vchiq_proc_deinit(void);
--extern struct proc_dir_entry *vchiq_proc_top(void);
--extern struct proc_dir_entry *vchiq_clients_top(void);
--
- 
- #endif /* VCHIQ_ARM_H */
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h	2012-10-21 15:15:10.008259889 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,22 +0,0 @@
--/*
-- * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-- */
--
--const char *vchiq_get_build_hostname(void);
--const char *vchiq_get_build_version(void);
--const char *vchiq_get_build_time(void);
--const char *vchiq_get_build_date(void);
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h	2012-10-21 15:15:10.008259889 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h	2012-10-17 18:57:47.000000000 +0200
-@@ -19,14 +19,12 @@
- #ifndef VCHIQ_CFG_H
- #define VCHIQ_CFG_H
- 
--#define VCHIQ_MAGIC              VCHIQ_MAKE_FOURCC('V', 'C', 'H', 'I')
-+#define VCHIQ_MAGIC              VCHIQ_MAKE_FOURCC('V','C','H','I')
- /* The version of VCHIQ - change with any non-trivial change */
--#define VCHIQ_VERSION            5
--/* The minimum compatible version - update to match VCHIQ_VERSION with any
--** incompatible change */
--#define VCHIQ_VERSION_MIN        3
-+#define VCHIQ_VERSION            2
-+/* The minimum compatible version - update to match VCHIQ_VERSION with any incompatible change */
-+#define VCHIQ_VERSION_MIN        2
- 
--#define VCHIQ_MAX_STATES         1
- #define VCHIQ_MAX_SERVICES       4096
- #define VCHIQ_MAX_SLOTS          128
- #define VCHIQ_MAX_SLOTS_PER_SIDE 64
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c	2012-10-21 15:15:10.009259909 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c	2012-10-17 18:57:47.000000000 +0200
-@@ -12,18 +12,20 @@
- * consent.
- *****************************************************************************/
- 
-+#include "vcos.h"
- #include "vchiq_connected.h"
--#include "vchiq_core.h"
- #include <linux/module.h>
--#include <linux/mutex.h>
- 
- #define  MAX_CALLBACKS  10
- 
--static   int                        g_connected;
-+static   int                        g_connected = 0;
- static   int                        g_num_deferred_callbacks;
--static   VCHIQ_CONNECTED_CALLBACK_T g_deferred_callback[MAX_CALLBACKS];
--static   int                        g_once_init;
--static   struct mutex               g_connected_mutex;
-+static   VCHIQ_CONNECTED_CALLBACK_T g_deferred_callback[ MAX_CALLBACKS ];
-+static   VCOS_ONCE_T                g_once_init;
-+static   VCOS_MUTEX_T               g_connected_mutex;
-+
-+extern VCOS_LOG_CAT_T vchiq_core_log_category;
-+#define  VCOS_LOG_CATEGORY (&vchiq_core_log_category)
- 
- /****************************************************************************
- *
-@@ -31,12 +33,9 @@
- *
- ***************************************************************************/
- 
--static void connected_init(void)
-+static void connected_init( void )
- {
--	if (!g_once_init) {
--		mutex_init(&g_connected_mutex);
--		g_once_init = 1;
--	}
-+   vcos_mutex_create( &g_connected_mutex, "connected_mutex");
- }
- 
- /****************************************************************************
-@@ -48,30 +47,32 @@
- *
- ***************************************************************************/
- 
--void vchiq_add_connected_callback(VCHIQ_CONNECTED_CALLBACK_T callback)
-+void vchiq_add_connected_callback( VCHIQ_CONNECTED_CALLBACK_T callback )
- {
--	connected_init();
--
--	if (mutex_lock_interruptible(&g_connected_mutex) != 0)
--		return;
-+   vcos_once( &g_once_init, connected_init );
- 
--	if (g_connected)
--		/* We're already connected. Call the callback immediately. */
-+   vcos_mutex_lock( &g_connected_mutex );
- 
--		callback();
--	else {
--		if (g_num_deferred_callbacks >= MAX_CALLBACKS)
--			vchiq_log_error(vchiq_core_log_level,
--				"There already %d callback registered - "
--				"please increase MAX_CALLBACKS",
--				g_num_deferred_callbacks);
--		else {
--			g_deferred_callback[g_num_deferred_callbacks] =
--				callback;
--			g_num_deferred_callbacks++;
--		}
--	}
--	mutex_unlock(&g_connected_mutex);
-+   if ( g_connected )
-+   {
-+      // We're already connected. Call the callback immediately.
-+
-+      callback();
-+   }
-+   else
-+   {
-+      if ( g_num_deferred_callbacks >= MAX_CALLBACKS )
-+      {
-+         vcos_log_error( "There already %d callback registered - please increase MAX_CALLBACKS",
-+                         g_num_deferred_callbacks );
-+      }
-+      else
-+      {
-+         g_deferred_callback[ g_num_deferred_callbacks ] = callback;
-+         g_num_deferred_callbacks++;
-+      }
-+   }
-+   vcos_mutex_unlock( &g_connected_mutex );
- }
- 
- /****************************************************************************
-@@ -81,20 +82,20 @@
- *
- ***************************************************************************/
- 
--void vchiq_call_connected_callbacks(void)
-+void vchiq_call_connected_callbacks( void )
- {
--	int i;
--
--	connected_init();
-+   int   i;
- 
--	if (mutex_lock_interruptible(&g_connected_mutex) != 0)
--		return;
-+   vcos_once( &g_once_init, connected_init );
- 
--	for (i = 0; i <  g_num_deferred_callbacks; i++)
--		g_deferred_callback[i]();
--
--	g_num_deferred_callbacks = 0;
--	g_connected = 1;
--	mutex_unlock(&g_connected_mutex);
-+   vcos_mutex_lock( &g_connected_mutex );
-+   for ( i = 0; i <  g_num_deferred_callbacks; i++ )\
-+   {
-+      g_deferred_callback[i]();
-+   }
-+   g_num_deferred_callbacks = 0;
-+   g_connected = 1;
-+   vcos_mutex_unlock( &g_connected_mutex );
- }
--EXPORT_SYMBOL(vchiq_add_connected_callback);
-+
-+EXPORT_SYMBOL( vchiq_add_connected_callback );
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h	2012-10-21 15:15:10.009259909 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h	2012-10-17 18:57:47.000000000 +0200
-@@ -19,14 +19,14 @@
- 
- /* ---- Constants and Types ---------------------------------------------- */
- 
--typedef void (*VCHIQ_CONNECTED_CALLBACK_T)(void);
-+typedef void (*VCHIQ_CONNECTED_CALLBACK_T)( void );
- 
- /* ---- Variable Externs ------------------------------------------------- */
- 
- /* ---- Function Prototypes ---------------------------------------------- */
- 
--void vchiq_add_connected_callback(VCHIQ_CONNECTED_CALLBACK_T callback);
--void vchiq_call_connected_callbacks(void);
-+void vchiq_add_connected_callback( VCHIQ_CONNECTED_CALLBACK_T callback );
-+void vchiq_call_connected_callbacks( void );
- 
- #endif /* VCHIQ_CONNECTED_H */
- 
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c	2012-10-21 15:15:10.013259988 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c	2012-10-17 18:57:47.000000000 +0200
-@@ -20,3594 +20,2698 @@
- 
- #define VCHIQ_SLOT_HANDLER_STACK 8192
- 
--#define HANDLE_STATE_SHIFT 12
--
- #define SLOT_INFO_FROM_INDEX(state, index) (state->slot_info + (index))
- #define SLOT_DATA_FROM_INDEX(state, index) (state->slot_data + (index))
--#define SLOT_INDEX_FROM_DATA(state, data) \
--	(((unsigned int)((char *)data - (char *)state->slot_data)) / \
--	VCHIQ_SLOT_SIZE)
--#define SLOT_INDEX_FROM_INFO(state, info) \
--	((unsigned int)(info - state->slot_info))
--#define SLOT_QUEUE_INDEX_FROM_POS(pos) \
--	((int)((unsigned int)(pos) / VCHIQ_SLOT_SIZE))
-+#define SLOT_INDEX_FROM_DATA(state, data) (((unsigned int)((char *)data - (char *)state->slot_data)) / VCHIQ_SLOT_SIZE)
-+#define SLOT_INDEX_FROM_INFO(state, info) ((unsigned int)(info - state->slot_info))
-+#define SLOT_QUEUE_INDEX_FROM_POS(pos) ((int)((unsigned int)(pos) / VCHIQ_SLOT_SIZE))
- 
-+#define VCOS_LOG_CATEGORY (&vchiq_core_log_category)
- 
- #define BULK_INDEX(x) (x & (VCHIQ_NUM_SERVICE_BULKS - 1))
- 
- 
--struct vchiq_open_payload {
--	int fourcc;
--	int client_id;
--	short version;
--	short version_min;
--};
-+/* Used to check use counts allow vchiq use. */
-+extern VCHIQ_STATUS_T vchiq_check_service(VCHIQ_SERVICE_T * service);
- 
--/* we require this for consistency between endpoints */
--vchiq_static_assert(sizeof(VCHIQ_HEADER_T) == 8);
--vchiq_static_assert(IS_POW2(sizeof(VCHIQ_HEADER_T)));
--vchiq_static_assert(IS_POW2(VCHIQ_NUM_CURRENT_BULKS));
--vchiq_static_assert(IS_POW2(VCHIQ_NUM_SERVICE_BULKS));
--vchiq_static_assert(IS_POW2(VCHIQ_MAX_SERVICES));
--vchiq_static_assert(VCHIQ_VERSION >= VCHIQ_VERSION_MIN);
--
--/* Run time control of log level, based on KERN_XXX level. */
--int vchiq_core_log_level = VCHIQ_LOG_DEFAULT;
--int vchiq_core_msg_log_level = VCHIQ_LOG_DEFAULT;
--int vchiq_sync_log_level = VCHIQ_LOG_DEFAULT;
--
--static atomic_t pause_bulks_count = ATOMIC_INIT(0);
--
--static DEFINE_SPINLOCK(service_spinlock);
--DEFINE_SPINLOCK(bulk_waiter_spinlock);
--DEFINE_SPINLOCK(quota_spinlock);
--
--VCHIQ_STATE_T *vchiq_states[VCHIQ_MAX_STATES];
--static unsigned int handle_seq;
--
--static const char *const srvstate_names[] = {
--	"FREE",
--	"HIDDEN",
--	"LISTENING",
--	"OPENING",
--	"OPEN",
--	"OPENSYNC",
--	"CLOSESENT",
--	"CLOSERECVD",
--	"CLOSEWAIT",
--	"CLOSED"
--};
- 
--static const char *const reason_names[] = {
--	"SERVICE_OPENED",
--	"SERVICE_CLOSED",
--	"MESSAGE_AVAILABLE",
--	"BULK_TRANSMIT_DONE",
--	"BULK_RECEIVE_DONE",
--	"BULK_TRANSMIT_ABORTED",
--	"BULK_RECEIVE_ABORTED"
-+typedef struct bulk_waiter_struct
-+{
-+   VCOS_EVENT_T event;
-+   int actual;
-+} BULK_WAITER_T;
-+
-+typedef struct vchiq_open_payload_struct{
-+   int fourcc;
-+   int client_id;
-+   short version;
-+   short version_min;
-+} VCHIQ_OPEN_PAYLOAD_T;
-+
-+vcos_static_assert(sizeof(VCHIQ_HEADER_T) == 8);   /* we require this for consistency between endpoints */
-+vcos_static_assert(IS_POW2(sizeof(VCHIQ_HEADER_T)));
-+vcos_static_assert(IS_POW2(VCHIQ_NUM_CURRENT_BULKS));
-+vcos_static_assert(IS_POW2(VCHIQ_NUM_SERVICE_BULKS));
-+
-+VCOS_LOG_CAT_T vchiq_core_log_category;
-+VCOS_LOG_CAT_T vchiq_core_msg_log_category;
-+VCOS_LOG_LEVEL_T vchiq_default_core_log_level = VCOS_LOG_WARN;
-+VCOS_LOG_LEVEL_T vchiq_default_core_msg_log_level = VCOS_LOG_WARN;
-+
-+static const char *const srvstate_names[] =
-+{
-+   "FREE",
-+   "HIDDEN",
-+   "LISTENING",
-+   "OPENING",
-+   "OPEN",
-+   "CLOSESENT",
-+   "CLOSING",
-+   "CLOSEWAIT"
- };
- 
--static const char *const conn_state_names[] = {
--	"DISCONNECTED",
--	"CONNECTING",
--	"CONNECTED",
--	"PAUSING",
--	"PAUSE_SENT",
--	"PAUSED",
--	"RESUMING"
-+static const char *const reason_names[] =
-+{
-+   "SERVICE_OPENED",
-+   "SERVICE_CLOSED",
-+   "MESSAGE_AVAILABLE",
-+   "BULK_TRANSMIT_DONE",
-+   "BULK_RECEIVE_DONE",
-+   "BULK_TRANSMIT_ABORTED",
-+   "BULK_RECEIVE_ABORTED"
- };
- 
-+static const char *const conn_state_names[] =
-+{
-+   "DISCONNECTED",
-+   "CONNECTED",
-+   "PAUSING",
-+   "PAUSE_SENT",
-+   "PAUSED",
-+   "RESUMING"
-+};
- 
--static void
--release_message_sync(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header);
--
--static const char *msg_type_str(unsigned int msg_type)
-+static const char *msg_type_str( unsigned int msg_type )
- {
--	switch (msg_type) {
--	case VCHIQ_MSG_PADDING:       return "PADDING";
--	case VCHIQ_MSG_CONNECT:       return "CONNECT";
--	case VCHIQ_MSG_OPEN:          return "OPEN";
--	case VCHIQ_MSG_OPENACK:       return "OPENACK";
--	case VCHIQ_MSG_CLOSE:         return "CLOSE";
--	case VCHIQ_MSG_DATA:          return "DATA";
--	case VCHIQ_MSG_BULK_RX:       return "BULK_RX";
--	case VCHIQ_MSG_BULK_TX:       return "BULK_TX";
--	case VCHIQ_MSG_BULK_RX_DONE:  return "BULK_RX_DONE";
--	case VCHIQ_MSG_BULK_TX_DONE:  return "BULK_TX_DONE";
--	case VCHIQ_MSG_PAUSE:         return "PAUSE";
--	case VCHIQ_MSG_RESUME:        return "RESUME";
--	case VCHIQ_MSG_REMOTE_USE:    return "REMOTE_USE";
--	case VCHIQ_MSG_REMOTE_RELEASE:      return "REMOTE_RELEASE";
--	case VCHIQ_MSG_REMOTE_USE_ACTIVE:   return "REMOTE_USE_ACTIVE";
--	}
--	return "???";
-+   switch (msg_type) {
-+   case VCHIQ_MSG_PADDING:       return "PADDING";
-+   case VCHIQ_MSG_CONNECT:       return "CONNECT";
-+   case VCHIQ_MSG_OPEN:          return "OPEN";
-+   case VCHIQ_MSG_OPENACK:       return "OPENACK";
-+   case VCHIQ_MSG_CLOSE:         return "CLOSE";
-+   case VCHIQ_MSG_DATA:          return "DATA";
-+   case VCHIQ_MSG_BULK_RX:       return "BULK_RX";
-+   case VCHIQ_MSG_BULK_TX:       return "BULK_TX";
-+   case VCHIQ_MSG_BULK_RX_DONE:  return "BULK_RX_DONE";
-+   case VCHIQ_MSG_BULK_TX_DONE:  return "BULK_TX_DONE";
-+   case VCHIQ_MSG_PAUSE:         return "PAUSE";
-+   case VCHIQ_MSG_RESUME:        return "RESUME";
-+   }
-+   return "???";
- }
- 
- static inline void
- vchiq_set_service_state(VCHIQ_SERVICE_T *service, int newstate)
- {
--	vchiq_log_info(vchiq_core_log_level, "%d: srv:%d %s->%s",
--		service->state->id, service->localport,
--		srvstate_names[service->srvstate],
--		srvstate_names[newstate]);
--	service->srvstate = newstate;
--}
--
--VCHIQ_SERVICE_T *
--find_service_by_handle(VCHIQ_SERVICE_HANDLE_T handle)
--{
--	VCHIQ_SERVICE_T *service;
--
--	spin_lock(&service_spinlock);
--	service = handle_to_service(handle);
--	if (service && (service->srvstate != VCHIQ_SRVSTATE_FREE) &&
--		(service->handle == handle)) {
--		BUG_ON(service->ref_count == 0);
--		service->ref_count++;
--	} else
--		service = NULL;
--	spin_unlock(&service_spinlock);
--
--	if (!service)
--		vchiq_log_info(vchiq_core_log_level,
--			"Invalid service handle 0x%x", handle);
--
--	return service;
--}
--
--VCHIQ_SERVICE_T *
--find_service_by_port(VCHIQ_STATE_T *state, int localport)
--{
--	VCHIQ_SERVICE_T *service = NULL;
--	if ((unsigned int)localport <= VCHIQ_PORT_MAX) {
--		spin_lock(&service_spinlock);
--		service = state->services[localport];
--		if (service && (service->srvstate != VCHIQ_SRVSTATE_FREE)) {
--			BUG_ON(service->ref_count == 0);
--			service->ref_count++;
--		} else
--			service = NULL;
--		spin_unlock(&service_spinlock);
--	}
--
--	if (!service)
--		vchiq_log_info(vchiq_core_log_level,
--			"Invalid port %d", localport);
--
--	return service;
--}
--
--VCHIQ_SERVICE_T *
--find_service_for_instance(VCHIQ_INSTANCE_T instance,
--	VCHIQ_SERVICE_HANDLE_T handle) {
--	VCHIQ_SERVICE_T *service;
--
--	spin_lock(&service_spinlock);
--	service = handle_to_service(handle);
--	if (service && (service->srvstate != VCHIQ_SRVSTATE_FREE) &&
--		(service->handle == handle) &&
--		(service->instance == instance)) {
--		BUG_ON(service->ref_count == 0);
--		service->ref_count++;
--	} else
--		service = NULL;
--	spin_unlock(&service_spinlock);
--
--	if (!service)
--		vchiq_log_info(vchiq_core_log_level,
--			"Invalid service handle 0x%x", handle);
--
--	return service;
--}
--
--VCHIQ_SERVICE_T *
--next_service_by_instance(VCHIQ_STATE_T *state, VCHIQ_INSTANCE_T instance,
--	int *pidx)
--{
--	VCHIQ_SERVICE_T *service = NULL;
--	int idx = *pidx;
--
--	spin_lock(&service_spinlock);
--	while (idx < state->unused_service) {
--		VCHIQ_SERVICE_T *srv = state->services[idx++];
--		if (srv && (srv->srvstate != VCHIQ_SRVSTATE_FREE) &&
--			(srv->instance == instance)) {
--			service = srv;
--			BUG_ON(service->ref_count == 0);
--			service->ref_count++;
--			break;
--		}
--	}
--	spin_unlock(&service_spinlock);
--
--	*pidx = idx;
--
--	return service;
--}
--
--void
--lock_service(VCHIQ_SERVICE_T *service)
--{
--	spin_lock(&service_spinlock);
--	BUG_ON(!service || (service->ref_count == 0));
--	if (service)
--		service->ref_count++;
--	spin_unlock(&service_spinlock);
-+   vcos_log_info("%d: srv:%d %s->%s", service->state->id, service->localport,
-+      srvstate_names[service->srvstate],
-+      srvstate_names[newstate]);
-+   service->srvstate = newstate;
- }
- 
--void
--unlock_service(VCHIQ_SERVICE_T *service)
--{
--	VCHIQ_STATE_T *state = service->state;
--	spin_lock(&service_spinlock);
--	BUG_ON(!service || (service->ref_count == 0));
--	if (service && service->ref_count) {
--		service->ref_count--;
--		if (!service->ref_count) {
--			BUG_ON(service->srvstate != VCHIQ_SRVSTATE_FREE);
--			state->services[service->localport] = NULL;
--		}
--		else
--			service = NULL;
--	}
--	spin_unlock(&service_spinlock);
--
--	kfree(service);
--}
--
--int
--vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T handle)
--{
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	int id;
--
--	id = service ? service->client_id : 0;
--	if (service)
--		unlock_service(service);
--
--	return id;
--}
--
--void *
--vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T handle)
--{
--	VCHIQ_SERVICE_T *service = handle_to_service(handle);
--
--	return service ? service->base.userdata : NULL;
--}
--
--int
--vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T handle)
-+static inline int
-+is_valid_service(VCHIQ_SERVICE_T *service)
- {
--	VCHIQ_SERVICE_T *service = handle_to_service(handle);
--
--	return service ? service->base.fourcc : 0;
--}
--
--static void
--mark_service_closing(VCHIQ_SERVICE_T *service)
--{
--	VCHIQ_STATE_T *state = service->state;
--	VCHIQ_SERVICE_QUOTA_T *service_quota;
--
--	service->closing = 1;
--
--	/* Synchronise with other threads. */
--	mutex_lock(&state->recycle_mutex);
--	mutex_unlock(&state->recycle_mutex);
--	mutex_lock(&state->slot_mutex);
--	mutex_unlock(&state->slot_mutex);
--
--	/* Unblock any sending thread. */
--	service_quota = &state->service_quotas[service->localport];
--	up(&service_quota->quota_event);
-+   return ((service != NULL) &&
-+      (service->srvstate != VCHIQ_SRVSTATE_FREE));
- }
- 
- static inline VCHIQ_STATUS_T
- make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason,
--	VCHIQ_HEADER_T *header, void *bulk_userdata)
-+   VCHIQ_HEADER_T *header, void *bulk_userdata)
- {
--	vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %x, %x)",
--		service->state->id, service->localport, reason_names[reason],
--		(unsigned int)header, (unsigned int)bulk_userdata);
--	return service->base.callback(reason, header, service->handle,
--		bulk_userdata);
-+   vcos_log_trace("%d: callback:%d (%s, %x, %x)", service->state->id,
-+      service->localport, reason_names[reason],
-+      (unsigned int)header, (unsigned int)bulk_userdata);
-+   return service->base.callback(reason, header, &service->base, bulk_userdata);
- }
- 
- static inline void
- vchiq_set_conn_state(VCHIQ_STATE_T *state, VCHIQ_CONNSTATE_T newstate)
- {
--	VCHIQ_CONNSTATE_T oldstate = state->conn_state;
--	vchiq_log_info(vchiq_core_log_level, "%d: %s->%s", state->id,
--		conn_state_names[oldstate],
--		conn_state_names[newstate]);
--	state->conn_state = newstate;
--	vchiq_platform_conn_state_changed(state, oldstate, newstate);
-+   VCHIQ_CONNSTATE_T oldstate = state->conn_state;
-+   vcos_log_info("%d: %s->%s", state->id,
-+      conn_state_names[oldstate],
-+      conn_state_names[newstate]);
-+   state->conn_state = newstate;
-+   vchiq_platform_conn_state_changed(state, oldstate, newstate);
- }
- 
- static inline void
- remote_event_create(REMOTE_EVENT_T *event)
- {
--	event->armed = 0;
--	/* Don't clear the 'fired' flag because it may already have been set
--	** by the other side. */
--	sema_init(event->event, 0);
-+   event->armed = 0;
-+   /* Don't clear the 'fired' flag because it may already have been set by the other side */
-+   vcos_event_create(event->event, "vchiq");
- }
- 
- static inline void
- remote_event_destroy(REMOTE_EVENT_T *event)
- {
--	(void)event;
-+   vcos_event_delete(event->event);
- }
- 
- static inline int
- remote_event_wait(REMOTE_EVENT_T *event)
- {
--	if (!event->fired) {
--		event->armed = 1;
--		dsb();
--		if (!event->fired) {
--			if (down_interruptible(event->event) != 0) {
--				event->armed = 0;
--				return 0;
--			}
--		}
--		event->armed = 0;
--		wmb();
--	}
-+   if (!event->fired)
-+   {
-+      event->armed = 1;
-+      if (event->fired) /* Also ensures the write has completed */
-+         event->armed = 0;
-+      else if (vcos_event_wait(event->event) != VCOS_SUCCESS)
-+         return 0;
-+   }
- 
--	event->fired = 0;
--	return 1;
-+   event->fired = 0;
-+   return 1;
- }
- 
- static inline void
- remote_event_signal_local(REMOTE_EVENT_T *event)
- {
--	event->armed = 0;
--	up(event->event);
-+   event->armed = 0;
-+   vcos_event_signal(event->event);
- }
- 
- static inline void
- remote_event_poll(REMOTE_EVENT_T *event)
- {
--	if (event->fired && event->armed)
--		remote_event_signal_local(event);
-+   if (event->armed)
-+      remote_event_signal_local(event);
- }
- 
- void
- remote_event_pollall(VCHIQ_STATE_T *state)
- {
--	remote_event_poll(&state->local->sync_trigger);
--	remote_event_poll(&state->local->sync_release);
--	remote_event_poll(&state->local->trigger);
--	remote_event_poll(&state->local->recycle);
-+   remote_event_poll(&state->local->trigger);
-+   remote_event_poll(&state->local->recycle);
- }
- 
- /* Round up message sizes so that any space at the end of a slot is always big
--** enough for a header. This relies on header size being a power of two, which
--** has been verified earlier by a static assertion. */
-+   enough for a header. This relies on header size being a power of two, which
-+   has been verified earlier by a static assertion. */
- 
- static inline unsigned int
- calc_stride(unsigned int size)
- {
--	/* Allow room for the header */
--	size += sizeof(VCHIQ_HEADER_T);
-+   /* Allow room for the header */
-+   size += sizeof(VCHIQ_HEADER_T);
- 
--	/* Round up */
--	return (size + sizeof(VCHIQ_HEADER_T) - 1) & ~(sizeof(VCHIQ_HEADER_T)
--		- 1);
-+   /* Round up */
-+   return (size + sizeof(VCHIQ_HEADER_T) - 1) & ~(sizeof(VCHIQ_HEADER_T) - 1);
- }
- 
--/* Called by the slot handler thread */
- static VCHIQ_SERVICE_T *
- get_listening_service(VCHIQ_STATE_T *state, int fourcc)
- {
--	int i;
-+   int i;
- 
--	WARN_ON(fourcc == VCHIQ_FOURCC_INVALID);
-+   vcos_assert(fourcc != VCHIQ_FOURCC_INVALID);
- 
--	for (i = 0; i < state->unused_service; i++) {
--		VCHIQ_SERVICE_T *service = state->services[i];
--		if (service &&
--			(service->public_fourcc == fourcc) &&
--			((service->srvstate == VCHIQ_SRVSTATE_LISTENING) ||
--			((service->srvstate == VCHIQ_SRVSTATE_OPEN) &&
--			(service->remoteport == VCHIQ_PORT_FREE)))) {
--			lock_service(service);
--			return service;
--		}
--	}
-+   for (i = 0; i < state->unused_service; i++)
-+   {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      if (service &&
-+         (service->public_fourcc == fourcc) &&
-+         ((service->srvstate == VCHIQ_SRVSTATE_LISTENING) ||
-+         ((service->srvstate == VCHIQ_SRVSTATE_OPEN) &&
-+         (service->remoteport == VCHIQ_PORT_FREE))))
-+         return service;
-+   }
- 
--	return NULL;
-+   return NULL;
- }
- 
--/* Called by the slot handler thread */
- static VCHIQ_SERVICE_T *
- get_connected_service(VCHIQ_STATE_T *state, unsigned int port)
- {
--	int i;
--	for (i = 0; i < state->unused_service; i++) {
--		VCHIQ_SERVICE_T *service = state->services[i];
--		if (service && (service->srvstate == VCHIQ_SRVSTATE_OPEN)
--			&& (service->remoteport == port)) {
--			lock_service(service);
--			return service;
--		}
--	}
--	return NULL;
-+   int i;
-+   for (i = 0; i < state->unused_service; i++) {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      if (service && (service->srvstate == VCHIQ_SRVSTATE_OPEN)
-+         && (service->remoteport == port)) {
-+         return service;
-+      }
-+   }
-+   return NULL;
- }
- 
--inline void
-+static inline void
- request_poll(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int poll_type)
- {
--	uint32_t value;
--
--	if (service) {
--		do {
--			value = atomic_read(&service->poll_flags);
--		} while (atomic_cmpxchg(&service->poll_flags, value,
--			value | (1 << poll_type)) != value);
--
--		do {
--			value = atomic_read(&state->poll_services[
--				service->localport>>5]);
--		} while (atomic_cmpxchg(
--			&state->poll_services[service->localport>>5],
--			value, value | (1 << (service->localport & 0x1f)))
--			!= value);
--	}
-+   if (service)
-+   {
-+      vcos_atomic_flags_or(&service->poll_flags, (1 << poll_type));
-+      vcos_atomic_flags_or(&state->poll_services[service->localport>>5],
-+         (1 <<(service->localport & 0x1f)));
-+   }
- 
--	state->poll_needed = 1;
--	wmb();
-+   state->poll_needed = 1;
-+   vcos_wmb(&state->poll_needed);
- 
--	/* ... and ensure the slot handler runs. */
--	remote_event_signal_local(&state->local->trigger);
-+   /* ... and ensure the slot handler runs. */
-+   remote_event_signal_local(&state->local->trigger);
- }
- 
- /* Called from queue_message, by the slot handler and application threads,
--** with slot_mutex held */
-+   with slot_mutex held */
- static VCHIQ_HEADER_T *
- reserve_space(VCHIQ_STATE_T *state, int space, int is_blocking)
- {
--	VCHIQ_SHARED_STATE_T *local = state->local;
--	int tx_pos = state->local_tx_pos;
--	int slot_space = VCHIQ_SLOT_SIZE - (tx_pos & VCHIQ_SLOT_MASK);
--
--	if (space > slot_space) {
--		VCHIQ_HEADER_T *header;
--		/* Fill the remaining space with padding */
--		WARN_ON(state->tx_data == NULL);
--		header = (VCHIQ_HEADER_T *)
--			(state->tx_data + (tx_pos & VCHIQ_SLOT_MASK));
--		header->msgid = VCHIQ_MSGID_PADDING;
--		header->size = slot_space - sizeof(VCHIQ_HEADER_T);
--
--		tx_pos += slot_space;
--	}
--
--	/* If necessary, get the next slot. */
--	if ((tx_pos & VCHIQ_SLOT_MASK) == 0) {
--		int slot_index;
--
--		/* If there is no free slot... */
--
--		if (down_trylock(&state->slot_available_event) != 0) {
--			/* ...wait for one. */
-+   VCHIQ_SHARED_STATE_T *local = state->local;
-+   int tx_pos = state->local_tx_pos;
-+   int slot_space = VCHIQ_SLOT_SIZE - (tx_pos & VCHIQ_SLOT_MASK);
-+
-+   if (space > slot_space) {
-+      VCHIQ_HEADER_T *header;
-+      /* Fill the remaining space with padding */
-+      vcos_assert(state->tx_data != NULL);
-+      header = (VCHIQ_HEADER_T *) (state->tx_data + (tx_pos & VCHIQ_SLOT_MASK));
-+      header->msgid = VCHIQ_MSGID_PADDING;
-+      header->size = slot_space - sizeof(VCHIQ_HEADER_T);
-+
-+      tx_pos += slot_space;
-+   }
-+
-+   /* If necessary, get the next slot. */
-+   if ((tx_pos & VCHIQ_SLOT_MASK) == 0)
-+   {
-+      int slot_index;
-+
-+      /* If there is no free slot... */
-+      if (tx_pos == (state->slot_queue_available * VCHIQ_SLOT_SIZE))
-+      {
-+         /* ...wait for one. */
-+         VCHIQ_STATS_INC(state, slot_stalls);
-+
-+         /* But first, flush through the last slot. */
-+         local->tx_pos = tx_pos;
-+         remote_event_signal(&state->remote->trigger);
-+
-+         do {
-+            if (!is_blocking ||
-+               (vcos_event_wait(&state->slot_available_event) != VCOS_SUCCESS))
-+            {
-+               return NULL; /* No space available now */
-+            }
-+         }
-+         while (tx_pos == (state->slot_queue_available * VCHIQ_SLOT_SIZE));
-+      }
-+
-+      slot_index = local->slot_queue[SLOT_QUEUE_INDEX_FROM_POS(tx_pos) & VCHIQ_SLOT_QUEUE_MASK];
-+      state->tx_data = (char *)SLOT_DATA_FROM_INDEX(state, slot_index);
-+   }
- 
--			VCHIQ_STATS_INC(state, slot_stalls);
-+   state->local_tx_pos = tx_pos + space;
- 
--			/* But first, flush through the last slot. */
--			state->local_tx_pos = tx_pos;
--			local->tx_pos = tx_pos;
--			remote_event_signal(&state->remote->trigger);
--
--			if (!is_blocking ||
--				(down_interruptible(
--				&state->slot_available_event) != 0))
--				return NULL; /* No space available */
--		}
--
--		BUG_ON(tx_pos ==
--			(state->slot_queue_available * VCHIQ_SLOT_SIZE));
--
--		slot_index = local->slot_queue[
--			SLOT_QUEUE_INDEX_FROM_POS(tx_pos) &
--			VCHIQ_SLOT_QUEUE_MASK];
--		state->tx_data =
--			(char *)SLOT_DATA_FROM_INDEX(state, slot_index);
--	}
--
--	state->local_tx_pos = tx_pos + space;
--
--	return (VCHIQ_HEADER_T *)(state->tx_data + (tx_pos & VCHIQ_SLOT_MASK));
-+   return (VCHIQ_HEADER_T *)(state->tx_data + (tx_pos & VCHIQ_SLOT_MASK));
- }
- 
--/* Called by the recycle thread. */
-+/* Called with slot_mutex held */
- static void
- process_free_queue(VCHIQ_STATE_T *state)
- {
--	VCHIQ_SHARED_STATE_T *local = state->local;
--	BITSET_T service_found[BITSET_SIZE(VCHIQ_MAX_SERVICES)];
--	int slot_queue_available;
--
--	/* Use a read memory barrier to ensure that any state that may have
--	** been modified by another thread is not masked by stale prefetched
--	** values. */
--	rmb();
--
--	/* Find slots which have been freed by the other side, and return them
--	** to the available queue. */
--	slot_queue_available = state->slot_queue_available;
--
--	while (slot_queue_available != local->slot_queue_recycle) {
--		unsigned int pos;
--		int slot_index = local->slot_queue[slot_queue_available++ &
--			VCHIQ_SLOT_QUEUE_MASK];
--		char *data = (char *)SLOT_DATA_FROM_INDEX(state, slot_index);
--		int data_found = 0;
--
--		vchiq_log_trace(vchiq_core_log_level, "%d: pfq %d=%x %x %x",
--			state->id, slot_index, (unsigned int)data,
--			local->slot_queue_recycle, slot_queue_available);
--
--		/* Initialise the bitmask for services which have used this
--		** slot */
--		BITSET_ZERO(service_found);
--
--		pos = 0;
--
--		while (pos < VCHIQ_SLOT_SIZE) {
--			VCHIQ_HEADER_T *header =
--				(VCHIQ_HEADER_T *)(data + pos);
--			int msgid = header->msgid;
--			if (VCHIQ_MSG_TYPE(msgid) == VCHIQ_MSG_DATA) {
--				int port = VCHIQ_MSG_SRCPORT(msgid);
--				VCHIQ_SERVICE_QUOTA_T *service_quota =
--					&state->service_quotas[port];
--				int count;
--				spin_lock(&quota_spinlock);
--				count = service_quota->message_use_count;
--				if (count > 0)
--					service_quota->message_use_count =
--						count - 1;
--				spin_unlock(&quota_spinlock);
--
--				if (count == service_quota->message_quota)
--					/* Signal the service that it
--					** has dropped below its quota
--					*/
--					up(&service_quota->quota_event);
--				else if (count == 0) {
--					vchiq_log_error(vchiq_core_log_level,
--						"service %d "
--						"message_use_count=%d "
--						"(header %x, msgid %x, "
--						"header->msgid %x, "
--						"header->size %x)",
--						port,
--						service_quota->
--							message_use_count,
--						(unsigned int)header, msgid,
--						header->msgid,
--						header->size);
--					WARN(1, "invalid message use count\n");
--				}
--				if (!BITSET_IS_SET(service_found, port)) {
--					/* Set the found bit for this service */
--					BITSET_SET(service_found, port);
--
--					spin_lock(&quota_spinlock);
--					count = service_quota->slot_use_count;
--					if (count > 0)
--						service_quota->slot_use_count =
--							count - 1;
--					spin_unlock(&quota_spinlock);
--
--					if (count > 0) {
--						/* Signal the service in case
--						** it has dropped below its
--						** quota */
--						up(&service_quota->quota_event);
--						vchiq_log_trace(
--							vchiq_core_log_level,
--							"%d: pfq:%d %x@%x - "
--							"slot_use->%d",
--							state->id, port,
--							header->size,
--							(unsigned int)header,
--							count - 1);
--					} else {
--						vchiq_log_error(
--							vchiq_core_log_level,
--								"service %d "
--								"slot_use_count"
--								"=%d (header %x"
--								", msgid %x, "
--								"header->msgid"
--								" %x, header->"
--								"size %x)",
--							port, count,
--							(unsigned int)header,
--							msgid,
--							header->msgid,
--							header->size);
--						WARN(1, "bad slot use count\n");
--					}
--				}
--
--				data_found = 1;
--			}
--
--			pos += calc_stride(header->size);
--			if (pos > VCHIQ_SLOT_SIZE) {
--				vchiq_log_error(vchiq_core_log_level,
--					"pfq - pos %x: header %x, msgid %x, "
--					"header->msgid %x, header->size %x",
--					pos, (unsigned int)header, msgid,
--					header->msgid, header->size);
--				WARN(1, "invalid slot position\n");
--			}
--		}
--
--		if (data_found) {
--			int count;
--			spin_lock(&quota_spinlock);
--			count = state->data_use_count;
--			if (count > 0)
--				state->data_use_count =
--					count - 1;
--			spin_unlock(&quota_spinlock);
--			if (count == state->data_quota)
--				up(&state->data_quota_event);
--		}
--
--		state->slot_queue_available = slot_queue_available;
--		up(&state->slot_available_event);
--	}
-+   VCHIQ_SHARED_STATE_T *local = state->local;
-+   BITSET_T service_found[BITSET_SIZE(VCHIQ_MAX_SERVICES)];
-+   int slot_queue_available;
-+
-+   /* Use a read memory barrier to ensure that any state that may have
-+      been modified by another thread is not masked by stale prefetched
-+      values. */
-+   vcos_rmb();
-+
-+   /* Find slots which have been freed by the other side, and return them to
-+      the available queue. */
-+   slot_queue_available = state->slot_queue_available;
-+
-+   while (slot_queue_available != local->slot_queue_recycle)
-+   {
-+      unsigned int pos;
-+      int slot_index = local->slot_queue[slot_queue_available++ & VCHIQ_SLOT_QUEUE_MASK];
-+      char *data = (char *)SLOT_DATA_FROM_INDEX(state, slot_index);
-+
-+      vcos_log_trace("%d: pfq %d=%x %x %x", state->id, slot_index,
-+         (unsigned int)data, local->slot_queue_recycle,
-+         slot_queue_available);
-+
-+      /* Initialise the bitmask for services which have used this slot */
-+      BITSET_ZERO(service_found);
-+
-+      pos = 0;
-+
-+      while (pos < VCHIQ_SLOT_SIZE)
-+      {
-+         VCHIQ_HEADER_T *header = (VCHIQ_HEADER_T *)(data + pos);
-+         int msgid = header->msgid;
-+         if (VCHIQ_MSG_TYPE(msgid) == VCHIQ_MSG_DATA)
-+         {
-+            int port = VCHIQ_MSG_SRCPORT(msgid);
-+            VCHIQ_SERVICE_QUOTA_T *service_quota =
-+               &state->service_quotas[port];
-+            int count;
-+            count = service_quota->message_use_count;
-+            if (count > 0)
-+            {
-+               service_quota->message_use_count = count - 1;
-+               if (count == service_quota->message_quota)
-+               {
-+                  /* Signal the service that it has dropped below its quota */
-+                  vcos_event_signal(&service_quota->quota_event);
-+               }
-+            }
-+            else
-+            {
-+               vcos_log_error("service %d message_use_count=%d (header %x,"
-+                              " msgid %x, header->msgid %x, header->size %x)",
-+                  port, service_quota->message_use_count,
-+                  (unsigned int)header, msgid, header->msgid,
-+                  header->size);
-+               vcos_assert(0);
-+            }
-+            if (!BITSET_IS_SET(service_found, port))
-+            {
-+               /* Set the found bit for this service */
-+               BITSET_SET(service_found, port);
-+
-+               count = service_quota->slot_use_count;
-+               if (count > 0)
-+               {
-+                  service_quota->slot_use_count = count - 1;
-+                  /* Signal the service in case it has dropped below its quota */
-+                  vcos_event_signal(&service_quota->quota_event);
-+                  vcos_log_trace("%d: pfq:%d %x@%x - slot_use->%d",
-+                     state->id, port,
-+                     header->size, (unsigned int)header,
-+                     service_quota->slot_use_count);
-+               }
-+               else
-+               {
-+                  vcos_log_error("service %d slot_use_count=%d (header %x,"
-+                                 " msgid %x, header->msgid %x, header->size %x)",
-+                     port, service_quota->slot_use_count,
-+                     (unsigned int)header, msgid, header->msgid,
-+                     header->size);
-+                  vcos_assert(0);
-+               }
-+            }
-+         }
-+
-+         pos += calc_stride(header->size);
-+         if (pos > VCHIQ_SLOT_SIZE)
-+         {
-+            vcos_log_error("pfq - pos %x: header %x, msgid %x, header->msgid %x, header->size %x",
-+               pos, (unsigned int)header, msgid, header->msgid, header->size);
-+            vcos_assert(0);
-+         }
-+      }
-+   }
-+
-+   if (slot_queue_available != state->slot_queue_available)
-+   {
-+      state->slot_queue_available = slot_queue_available;
-+      vcos_wmb(&state->slot_queue_available);
-+      vcos_event_signal(&state->slot_available_event);
-+   }
- }
- 
- /* Called by the slot handler and application threads */
- static VCHIQ_STATUS_T
- queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
--	int msgid, const VCHIQ_ELEMENT_T *elements,
--	int count, int size, int is_blocking)
-+   int msgid, const VCHIQ_ELEMENT_T *elements,
-+   int count, int size, int is_blocking)
- {
--	VCHIQ_SHARED_STATE_T *local;
--	VCHIQ_SERVICE_QUOTA_T *service_quota = NULL;
--	VCHIQ_HEADER_T *header;
--	int type = VCHIQ_MSG_TYPE(msgid);
--
--	unsigned int stride;
--
--	local = state->local;
--
--	stride = calc_stride(size);
--
--	WARN_ON(!(stride <= VCHIQ_SLOT_SIZE));
--
--	if ((type != VCHIQ_MSG_RESUME) &&
--		(mutex_lock_interruptible(&state->slot_mutex) != 0))
--		return VCHIQ_RETRY;
--
--	if (type == VCHIQ_MSG_DATA) {
--		int tx_end_index;
--
--		BUG_ON(!service);
--
--		if (service->closing) {
--			/* The service has been closed */
--			mutex_unlock(&state->slot_mutex);
--			return VCHIQ_ERROR;
--		}
--
--		service_quota = &state->service_quotas[service->localport];
--
--		spin_lock(&quota_spinlock);
--
--		/* Ensure this service doesn't use more than its quota of
--		** messages or slots */
--		tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(
--			state->local_tx_pos + stride - 1);
--
--		/* Ensure data messages don't use more than their quota of
--		** slots */
--		while ((tx_end_index != state->previous_data_index) &&
--			(state->data_use_count == state->data_quota)) {
--			VCHIQ_STATS_INC(state, data_stalls);
--			spin_unlock(&quota_spinlock);
--			mutex_unlock(&state->slot_mutex);
--
--			if (down_interruptible(&state->data_quota_event)
--				!= 0)
--				return VCHIQ_RETRY;
--
--			mutex_lock(&state->slot_mutex);
--			spin_lock(&quota_spinlock);
--			tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(
--				state->local_tx_pos + stride - 1);
--			if ((tx_end_index == state->previous_data_index) ||
--				(state->data_use_count < state->data_quota)) {
--				/* Pass the signal on to other waiters */
--				up(&state->data_quota_event);
--				break;
--			}
--		}
--
--		while ((service_quota->message_use_count ==
--				service_quota->message_quota) ||
--			((tx_end_index != service_quota->previous_tx_index) &&
--			(service_quota->slot_use_count ==
--				service_quota->slot_quota))) {
--			spin_unlock(&quota_spinlock);
--			vchiq_log_trace(vchiq_core_log_level,
--				"%d: qm:%d %s,%x - quota stall "
--				"(msg %d, slot %d)",
--				state->id, service->localport,
--				msg_type_str(type), size,
--				service_quota->message_use_count,
--				service_quota->slot_use_count);
--			VCHIQ_SERVICE_STATS_INC(service, quota_stalls);
--			mutex_unlock(&state->slot_mutex);
--			if (down_interruptible(&service_quota->quota_event)
--				!= 0)
--				return VCHIQ_RETRY;
--			if (service->closing)
--				return VCHIQ_ERROR;
--			if (mutex_lock_interruptible(&state->slot_mutex) != 0)
--				return VCHIQ_RETRY;
--			if (service->srvstate != VCHIQ_SRVSTATE_OPEN) {
--				/* The service has been closed */
--				mutex_unlock(&state->slot_mutex);
--				return VCHIQ_ERROR;
--			}
--			spin_lock(&quota_spinlock);
--			tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(
--				state->local_tx_pos + stride - 1);
--		}
--
--		spin_unlock(&quota_spinlock);
--	}
--
--	header = reserve_space(state, stride, is_blocking);
--
--	if (!header) {
--		if (service)
--			VCHIQ_SERVICE_STATS_INC(service, slot_stalls);
--		mutex_unlock(&state->slot_mutex);
--		return VCHIQ_RETRY;
--	}
--
--	if (type == VCHIQ_MSG_DATA) {
--		int i, pos;
--		int tx_end_index;
--		int slot_use_count;
--
--		vchiq_log_info(vchiq_core_log_level,
--			"%d: qm %s@%x,%x (%d->%d)",
--			state->id,
--			msg_type_str(VCHIQ_MSG_TYPE(msgid)),
--			(unsigned int)header, size,
--			VCHIQ_MSG_SRCPORT(msgid),
--			VCHIQ_MSG_DSTPORT(msgid));
--
--		BUG_ON(!service);
--
--		for (i = 0, pos = 0; i < (unsigned int)count;
--			pos += elements[i++].size)
--			if (elements[i].size) {
--				if (vchiq_copy_from_user
--					(header->data + pos, elements[i].data,
--					(size_t) elements[i].size) !=
--					VCHIQ_SUCCESS) {
--					mutex_unlock(&state->slot_mutex);
--					VCHIQ_SERVICE_STATS_INC(service,
--						error_count);
--					return VCHIQ_ERROR;
--				}
--				if (i == 0) {
--					if (vchiq_core_msg_log_level >=
--						VCHIQ_LOG_INFO)
--						vchiq_log_dump_mem("Sent", 0,
--							header->data + pos,
--							min(64,
--							elements[0].size));
--				}
--			}
--
--		spin_lock(&quota_spinlock);
--		service_quota->message_use_count++;
--
--		tx_end_index =
--			SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos - 1);
--
--		/* If this transmission can't fit in the last slot used by any
--		** service, the data_use_count must be increased. */
--		if (tx_end_index != state->previous_data_index) {
--			state->previous_data_index = tx_end_index;
--			state->data_use_count++;
--		}
--
--		/* If this isn't the same slot last used by this service,
--		** the service's slot_use_count must be increased. */
--		if (tx_end_index != service_quota->previous_tx_index) {
--			service_quota->previous_tx_index = tx_end_index;
--			slot_use_count = ++service_quota->slot_use_count;
--		} else {
--			slot_use_count = 0;
--		}
--
--		spin_unlock(&quota_spinlock);
--
--		if (slot_use_count)
--			vchiq_log_trace(vchiq_core_log_level,
--				"%d: qm:%d %s,%x - slot_use->%d (hdr %p)",
--				state->id, service->localport,
--				msg_type_str(VCHIQ_MSG_TYPE(msgid)), size,
--				slot_use_count, header);
--
--		VCHIQ_SERVICE_STATS_INC(service, ctrl_tx_count);
--		VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
--	} else {
--		vchiq_log_info(vchiq_core_log_level,
--			"%d: qm %s@%x,%x (%d->%d)", state->id,
--			msg_type_str(VCHIQ_MSG_TYPE(msgid)),
--			(unsigned int)header, size,
--			VCHIQ_MSG_SRCPORT(msgid),
--			VCHIQ_MSG_DSTPORT(msgid));
--		if (size != 0) {
--			WARN_ON(!((count == 1) && (size == elements[0].size)));
--			memcpy(header->data, elements[0].data,
--				elements[0].size);
--		}
--		VCHIQ_STATS_INC(state, ctrl_tx_count);
--	}
--
--	header->msgid = msgid;
--	header->size = size;
--
--	{
--		int svc_fourcc;
--
--		svc_fourcc = service
--			? service->base.fourcc
--			: VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
--
--		vchiq_log_info(vchiq_core_msg_log_level,
--			"Sent Msg %s(%u) to %c%c%c%c s:%u d:%d len:%d",
--			msg_type_str(VCHIQ_MSG_TYPE(msgid)),
--			VCHIQ_MSG_TYPE(msgid),
--			VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
--			VCHIQ_MSG_SRCPORT(msgid),
--			VCHIQ_MSG_DSTPORT(msgid),
--			size);
--	}
--
--	/* Make sure the new header is visible to the peer. */
--	wmb();
--
--	/* Make the new tx_pos visible to the peer. */
--	local->tx_pos = state->local_tx_pos;
--	wmb();
--
--	if (service && (type == VCHIQ_MSG_CLOSE))
--		vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSESENT);
--
--	if (VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_PAUSE)
--		mutex_unlock(&state->slot_mutex);
--
--	remote_event_signal(&state->remote->trigger);
--
--	return VCHIQ_SUCCESS;
--}
--
--/* Called by the slot handler and application threads */
--static VCHIQ_STATUS_T
--queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
--	int msgid, const VCHIQ_ELEMENT_T *elements,
--	int count, int size, int is_blocking)
--{
--	VCHIQ_SHARED_STATE_T *local;
--	VCHIQ_HEADER_T *header;
--
--	local = state->local;
--
--	if ((VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_RESUME) &&
--		(mutex_lock_interruptible(&state->sync_mutex) != 0))
--		return VCHIQ_RETRY;
--
--	remote_event_wait(&local->sync_release);
--
--	rmb();
--
--	header = (VCHIQ_HEADER_T *)SLOT_DATA_FROM_INDEX(state,
--		local->slot_sync);
--
--	{
--		int oldmsgid = header->msgid;
--		if (oldmsgid != VCHIQ_MSGID_PADDING)
--			vchiq_log_error(vchiq_core_log_level,
--				"%d: qms - msgid %x, not PADDING",
--				state->id, oldmsgid);
--	}
--
--	if (service) {
--		int i, pos;
--
--		vchiq_log_info(vchiq_sync_log_level,
--			"%d: qms %s@%x,%x (%d->%d)", state->id,
--			msg_type_str(VCHIQ_MSG_TYPE(msgid)),
--			(unsigned int)header, size,
--			VCHIQ_MSG_SRCPORT(msgid),
--			VCHIQ_MSG_DSTPORT(msgid));
--
--		for (i = 0, pos = 0; i < (unsigned int)count;
--			pos += elements[i++].size)
--			if (elements[i].size) {
--				if (vchiq_copy_from_user
--					(header->data + pos, elements[i].data,
--					(size_t) elements[i].size) !=
--					VCHIQ_SUCCESS) {
--					mutex_unlock(&state->sync_mutex);
--					VCHIQ_SERVICE_STATS_INC(service,
--						error_count);
--					return VCHIQ_ERROR;
--				}
--				if (i == 0) {
--					if (vchiq_sync_log_level >=
--						VCHIQ_LOG_TRACE)
--						vchiq_log_dump_mem("Sent Sync",
--							0, header->data + pos,
--							min(64,
--							elements[0].size));
--				}
--			}
--
--		VCHIQ_SERVICE_STATS_INC(service, ctrl_tx_count);
--		VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
--	} else {
--		vchiq_log_info(vchiq_sync_log_level,
--			"%d: qms %s@%x,%x (%d->%d)", state->id,
--			msg_type_str(VCHIQ_MSG_TYPE(msgid)),
--			(unsigned int)header, size,
--			VCHIQ_MSG_SRCPORT(msgid),
--			VCHIQ_MSG_DSTPORT(msgid));
--		if (size != 0) {
--			WARN_ON(!((count == 1) && (size == elements[0].size)));
--			memcpy(header->data, elements[0].data,
--				elements[0].size);
--		}
--		VCHIQ_STATS_INC(state, ctrl_tx_count);
--	}
--
--	header->size = size;
--	header->msgid = msgid;
--
--	if (vchiq_sync_log_level >= VCHIQ_LOG_TRACE) {
--		int svc_fourcc;
--
--		svc_fourcc = service
--			? service->base.fourcc
--			: VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
--
--		vchiq_log_trace(vchiq_sync_log_level,
--			"Sent Sync Msg %s(%u) to %c%c%c%c s:%u d:%d len:%d",
--			msg_type_str(VCHIQ_MSG_TYPE(msgid)),
--			VCHIQ_MSG_TYPE(msgid),
--			VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
--			VCHIQ_MSG_SRCPORT(msgid),
--			VCHIQ_MSG_DSTPORT(msgid),
--			size);
--	}
--
--	/* Make sure the new header is visible to the peer. */
--	wmb();
-+   VCHIQ_SHARED_STATE_T *local;
-+   VCHIQ_SERVICE_QUOTA_T *service_quota = NULL;
-+   VCHIQ_HEADER_T *header;
-+
-+   unsigned int stride;
-+
-+   local = state->local;
-+
-+   stride = calc_stride(size);
-+
-+   vcos_assert(stride <= VCHIQ_SLOT_SIZE);
-+
-+   /* On platforms where vcos_mutex_lock cannot fail, the return will never
-+      be taken and the compiler may optimise out that code. Let Coverity
-+      know this is intentional.
-+   */
-+   /* coverity[constant_expression_result] */
-+   if ((VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_RESUME) &&
-+      (vcos_mutex_lock(&state->slot_mutex) != VCOS_SUCCESS))
-+      return VCHIQ_RETRY;
-+
-+   if (service)
-+   {
-+      int tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1);
-+
-+      if (service->srvstate != VCHIQ_SRVSTATE_OPEN)
-+      {
-+         /* The service has been closed, probably while waiting for the mutex */
-+         vcos_mutex_unlock(&state->slot_mutex);
-+         return VCHIQ_ERROR;
-+      }
-+
-+      service_quota = &state->service_quotas[service->localport];
-+
-+      /* ...ensure it doesn't use more than its quota of messages or slots */
-+      while ((service_quota->message_use_count == service_quota->message_quota) ||
-+         ((tx_end_index != service_quota->previous_tx_index) &&
-+         (service_quota->slot_use_count == service_quota->slot_quota)))
-+      {
-+         vcos_log_trace("%d: qm:%d %s,%x - quota stall (msg %d, slot %d)",
-+            state->id, service->localport,
-+            msg_type_str(VCHIQ_MSG_TYPE(msgid)), size,
-+            service_quota->message_use_count, service_quota->slot_use_count);
-+         VCHIQ_SERVICE_STATS_INC(service, quota_stalls);
-+         vcos_mutex_unlock(&state->slot_mutex);
-+         if (vcos_event_wait(&service_quota->quota_event) != VCOS_SUCCESS)
-+            return VCHIQ_RETRY;
-+         if (vcos_mutex_lock(&state->slot_mutex) != VCOS_SUCCESS)
-+            return VCHIQ_RETRY;
-+         tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1);
-+      }
-+   }
-+
-+   header = reserve_space(state, stride, is_blocking);
-+
-+   if (!header) {
-+      if (service)
-+         VCHIQ_SERVICE_STATS_INC(service, slot_stalls);
-+      vcos_mutex_unlock(&state->slot_mutex);
-+      return VCHIQ_RETRY;
-+   }
-+
-+   if (service) {
-+      int i, pos;
-+      int tx_end_index;
-+
-+      vcos_log_info("%d: qm %s@%x,%x (%d->%d)", state->id,
-+         msg_type_str(VCHIQ_MSG_TYPE(msgid)),
-+         (unsigned int)header, size,
-+         VCHIQ_MSG_SRCPORT(msgid),
-+         VCHIQ_MSG_DSTPORT(msgid));
-+
-+      for (i = 0, pos = 0; i < (unsigned int)count;
-+         pos += elements[i++].size)
-+         if (elements[i].size) {
-+            if (vchiq_copy_from_user
-+               (header->data + pos, elements[i].data,
-+               (size_t) elements[i].size) !=
-+               VCHIQ_SUCCESS) {
-+               vcos_mutex_unlock(&state->slot_mutex);
-+               VCHIQ_SERVICE_STATS_INC(service, error_count);
-+               return VCHIQ_ERROR;
-+            }
-+            if (i == 0) {
-+               vcos_log_dump_mem( &vchiq_core_msg_log_category,
-+                              "Sent", 0, header->data + pos,
-+                              vcos_min( 64, elements[0].size ));
-+            }
-+         }
-+
-+      /* If this transmission can't fit in the last slot used by this service... */
-+      tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos - 1);
-+      if (tx_end_index != service_quota->previous_tx_index)
-+      {
-+         service_quota->slot_use_count++;
-+         vcos_log_trace("%d: qm:%d %s,%x - slot_use->%d",
-+            state->id, service->localport,
-+            msg_type_str(VCHIQ_MSG_TYPE(msgid)), size,
-+            service_quota->slot_use_count);
-+      }
-+
-+      service_quota->previous_tx_index = tx_end_index;
-+      service_quota->message_use_count++;
-+      VCHIQ_SERVICE_STATS_INC(service, ctrl_tx_count);
-+      VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
-+   } else {
-+      vcos_log_info("%d: qm %s@%x,%x (%d->%d)", state->id,
-+         msg_type_str(VCHIQ_MSG_TYPE(msgid)),
-+         (unsigned int)header, size,
-+         VCHIQ_MSG_SRCPORT(msgid),
-+         VCHIQ_MSG_DSTPORT(msgid));
-+      if (size != 0)
-+      { 
-+         vcos_assert((count == 1) && (size == elements[0].size));
-+         memcpy(header->data, elements[0].data, elements[0].size);
-+      }
-+      VCHIQ_STATS_INC(state, ctrl_tx_count);
-+   }
-+
-+   header->msgid = msgid;
-+   header->size = size;
-+
-+   if (vcos_is_log_enabled( &vchiq_core_msg_log_category, VCOS_LOG_INFO))
-+   {
-+      int svc_fourcc;
-+
-+      svc_fourcc = service
-+         ? service->base.fourcc
-+         : VCHIQ_MAKE_FOURCC('?','?','?','?');
-+
-+      vcos_log_impl( &vchiq_core_msg_log_category,
-+         VCOS_LOG_INFO,
-+         "Sent Msg %s(%u) to %c%c%c%c s:%u d:%d len:%d",
-+         msg_type_str(VCHIQ_MSG_TYPE(msgid)),
-+         VCHIQ_MSG_TYPE(msgid),
-+         VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
-+         VCHIQ_MSG_SRCPORT(msgid),
-+         VCHIQ_MSG_DSTPORT(msgid),
-+         size );
-+   }
-+
-+   /* Make the new tx_pos visible to the peer. */
-+   local->tx_pos = state->local_tx_pos;
-+   vcos_wmb(&local->tx_pos);
- 
--	remote_event_signal(&state->remote->sync_trigger);
-+   if (VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_PAUSE)
-+      vcos_mutex_unlock(&state->slot_mutex);
- 
--	if (VCHIQ_MSG_TYPE(msgid) != VCHIQ_MSG_PAUSE)
--		mutex_unlock(&state->sync_mutex);
-+   remote_event_signal(&state->remote->trigger);
- 
--	return VCHIQ_SUCCESS;
-+   return VCHIQ_SUCCESS;
- }
- 
- static inline void
- claim_slot(VCHIQ_SLOT_INFO_T *slot)
- {
--	slot->use_count++;
-+   slot->use_count++;
- }
- 
- static void
--release_slot(VCHIQ_STATE_T *state, VCHIQ_SLOT_INFO_T *slot_info,
--	VCHIQ_HEADER_T *header, VCHIQ_SERVICE_T *service)
-+release_slot(VCHIQ_STATE_T *state, VCHIQ_SLOT_INFO_T *slot_info)
- {
--	int release_count;
-+   int release_count;
-+   vcos_mutex_lock(&state->recycle_mutex);
- 
--	mutex_lock(&state->recycle_mutex);
-+   release_count = slot_info->release_count;
-+   slot_info->release_count = ++release_count;
- 
--	if (header) {
--		int msgid = header->msgid;
--		if (((msgid & VCHIQ_MSGID_CLAIMED) == 0) ||
--			(service && service->closing)) {
--			mutex_unlock(&state->recycle_mutex);
--			return;
--		}
--
--		/* Rewrite the message header to prevent a double
--		** release */
--		header->msgid = msgid & ~VCHIQ_MSGID_CLAIMED;
--	}
--
--	release_count = slot_info->release_count;
--	slot_info->release_count = ++release_count;
--
--	if (release_count == slot_info->use_count) {
--		int slot_queue_recycle;
--		/* Add to the freed queue */
--
--		/* A read barrier is necessary here to prevent speculative
--		** fetches of remote->slot_queue_recycle from overtaking the
--		** mutex. */
--		rmb();
--
--		slot_queue_recycle = state->remote->slot_queue_recycle;
--		state->remote->slot_queue[slot_queue_recycle &
--			VCHIQ_SLOT_QUEUE_MASK] =
--			SLOT_INDEX_FROM_INFO(state, slot_info);
--		state->remote->slot_queue_recycle = slot_queue_recycle + 1;
--		vchiq_log_info(vchiq_core_log_level,
--			"%d: release_slot %d - recycle->%x",
--			state->id, SLOT_INDEX_FROM_INFO(state, slot_info),
--			state->remote->slot_queue_recycle);
--
--		/* A write barrier is necessary, but remote_event_signal
--		** contains one. */
--		remote_event_signal(&state->remote->recycle);
--	}
-+   if (release_count == slot_info->use_count)
-+   {
-+      int slot_queue_recycle;
-+      /* Add to the freed queue */
-+
-+      /* A read barrier is necessary here to prevent speculative fetches of
-+         remote->slot_queue_recycle from overtaking the mutex. */
-+      vcos_rmb();
-+
-+      slot_queue_recycle = state->remote->slot_queue_recycle;
-+      state->remote->slot_queue[slot_queue_recycle & VCHIQ_SLOT_QUEUE_MASK] =
-+         SLOT_INDEX_FROM_INFO(state, slot_info);
-+      state->remote->slot_queue_recycle = slot_queue_recycle + 1;
-+      vcos_log_info("%d: release_slot %d - recycle->%x",
-+         state->id, SLOT_INDEX_FROM_INFO(state, slot_info),
-+         state->remote->slot_queue_recycle);
-+
-+      /* A write barrier is necessary, but remote_event_signal contains one. */
-+      remote_event_signal(&state->remote->recycle);
-+   }
- 
--	mutex_unlock(&state->recycle_mutex);
-+   vcos_mutex_unlock(&state->recycle_mutex);
- }
- 
- /* Called by the slot handler - don't hold the bulk mutex */
- static VCHIQ_STATUS_T
--notify_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue,
--	int retry_poll)
-+notify_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
- {
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
- 
--	vchiq_log_trace(vchiq_core_log_level,
--		"%d: nb:%d %cx - p=%x rn=%x r=%x",
--		service->state->id, service->localport,
--		(queue == &service->bulk_tx) ? 't' : 'r',
--		queue->process, queue->remote_notify, queue->remove);
--
--	if (service->state->is_master) {
--		while (queue->remote_notify != queue->process) {
--			VCHIQ_BULK_T *bulk =
--				&queue->bulks[BULK_INDEX(queue->remote_notify)];
--			int msgtype = (bulk->dir == VCHIQ_BULK_TRANSMIT) ?
--				VCHIQ_MSG_BULK_RX_DONE : VCHIQ_MSG_BULK_TX_DONE;
--			int msgid = VCHIQ_MAKE_MSG(msgtype, service->localport,
--				service->remoteport);
--			VCHIQ_ELEMENT_T element = { &bulk->actual, 4 };
--			/* Only reply to non-dummy bulk requests */
--			if (bulk->remote_data) {
--				status = queue_message(service->state, NULL,
--					msgid, &element, 1, 4, 0);
--				if (status != VCHIQ_SUCCESS)
--					break;
--			}
--			queue->remote_notify++;
--		}
--	} else {
--		queue->remote_notify = queue->process;
--	}
--
--	if (status == VCHIQ_SUCCESS) {
--		while (queue->remove != queue->remote_notify) {
--			VCHIQ_BULK_T *bulk =
--				&queue->bulks[BULK_INDEX(queue->remove)];
--
--			/* Only generate callbacks for non-dummy bulk
--			** requests, and non-terminated services */
--			if (bulk->data && service->instance) {
--				if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED) {
--					if (bulk->dir == VCHIQ_BULK_TRANSMIT) {
--						VCHIQ_SERVICE_STATS_INC(service,
--							bulk_tx_count);
--						VCHIQ_SERVICE_STATS_ADD(service,
--							bulk_tx_bytes,
--							bulk->actual);
--					} else {
--						VCHIQ_SERVICE_STATS_INC(service,
--							bulk_rx_count);
--						VCHIQ_SERVICE_STATS_ADD(service,
--							bulk_rx_bytes,
--							bulk->actual);
--					}
--				} else {
--					VCHIQ_SERVICE_STATS_INC(service,
--						bulk_aborted_count);
--				}
--				if (bulk->mode == VCHIQ_BULK_MODE_BLOCKING) {
--					struct bulk_waiter *waiter;
--					spin_lock(&bulk_waiter_spinlock);
--					waiter = bulk->userdata;
--					if (waiter) {
--						waiter->actual = bulk->actual;
--						up(&waiter->event);
--					}
--					spin_unlock(&bulk_waiter_spinlock);
--				} else if (bulk->mode ==
--					VCHIQ_BULK_MODE_CALLBACK) {
--					VCHIQ_REASON_T reason = (bulk->dir ==
--						VCHIQ_BULK_TRANSMIT) ?
--						((bulk->actual ==
--						VCHIQ_BULK_ACTUAL_ABORTED) ?
--						VCHIQ_BULK_TRANSMIT_ABORTED :
--						VCHIQ_BULK_TRANSMIT_DONE) :
--						((bulk->actual ==
--						VCHIQ_BULK_ACTUAL_ABORTED) ?
--						VCHIQ_BULK_RECEIVE_ABORTED :
--						VCHIQ_BULK_RECEIVE_DONE);
--					status = make_service_callback(service,
--						reason,	NULL, bulk->userdata);
--					if (status == VCHIQ_RETRY)
--						break;
--					status = VCHIQ_SUCCESS;
--				}
--			}
--
--			queue->remove++;
--			up(&service->bulk_remove_event);
--		}
--		if (!retry_poll)
--			status = VCHIQ_SUCCESS;
--	}
--
--	if (status == VCHIQ_RETRY)
--		request_poll(service->state, service,
--			(queue == &service->bulk_tx) ?
--			VCHIQ_POLL_TXNOTIFY : VCHIQ_POLL_RXNOTIFY);
-+   vcos_log_trace("%d: nb:%d %cx - p=%x rn=%x r=%x",
-+      service->state->id, service->localport,
-+      (queue == &service->bulk_tx) ? 't' : 'r',
-+      queue->process, queue->remote_notify, queue->remove);
-+
-+   if (service->state->is_master)
-+   {
-+      while (queue->remote_notify != queue->process)
-+      {
-+         VCHIQ_BULK_T *bulk = &queue->bulks[BULK_INDEX(queue->remote_notify)];
-+         int msgtype = (bulk->dir == VCHIQ_BULK_TRANSMIT) ?
-+            VCHIQ_MSG_BULK_RX_DONE : VCHIQ_MSG_BULK_TX_DONE;
-+         int msgid = VCHIQ_MAKE_MSG(msgtype, service->localport, service->remoteport);
-+         VCHIQ_ELEMENT_T element = { &bulk->actual, 4 };
-+         /* Only reply to non-dummy bulk requests */
-+         if (bulk->remote_data)
-+         {
-+            status = queue_message(service->state, NULL, msgid, &element, 1, 4, 0);
-+            if (status != VCHIQ_SUCCESS)
-+               break;
-+         }
-+         queue->remote_notify++;
-+      }
-+   }
-+   else
-+   {
-+      queue->remote_notify = queue->process;
-+   }
-+
-+   if (status == VCHIQ_SUCCESS)
-+   {
-+      while (queue->remove != queue->remote_notify)
-+      {
-+         VCHIQ_BULK_T *bulk = &queue->bulks[BULK_INDEX(queue->remove)];
-+
-+         /* Only generate callbacks for non-dummy bulk requests */
-+         if (bulk->data)
-+         {
-+            if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED)
-+            {
-+               if (bulk->dir == VCHIQ_BULK_TRANSMIT)
-+               {
-+                  VCHIQ_SERVICE_STATS_INC(service, bulk_tx_count);
-+                  VCHIQ_SERVICE_STATS_ADD(service, bulk_tx_bytes, bulk->actual);
-+               }
-+               else
-+               {
-+                  VCHIQ_SERVICE_STATS_INC(service, bulk_rx_count);
-+                  VCHIQ_SERVICE_STATS_ADD(service, bulk_rx_bytes, bulk->actual);
-+               }
-+            }
-+            else
-+            {
-+               VCHIQ_SERVICE_STATS_INC(service, bulk_aborted_count);
-+            }
-+            if (bulk->mode == VCHIQ_BULK_MODE_BLOCKING)
-+            {
-+               BULK_WAITER_T *waiter = (BULK_WAITER_T *)bulk->userdata;
-+               if (waiter)
-+               {
-+                  waiter->actual = bulk->actual;
-+                  vcos_event_signal(&waiter->event);
-+               }
-+            }
-+            else if (bulk->mode == VCHIQ_BULK_MODE_CALLBACK)
-+            {
-+               VCHIQ_REASON_T reason = (bulk->dir == VCHIQ_BULK_TRANSMIT) ?
-+                  ((bulk->actual == VCHIQ_BULK_ACTUAL_ABORTED) ?
-+                     VCHIQ_BULK_TRANSMIT_ABORTED : VCHIQ_BULK_TRANSMIT_DONE) :
-+                  ((bulk->actual == VCHIQ_BULK_ACTUAL_ABORTED) ?
-+                     VCHIQ_BULK_RECEIVE_ABORTED : VCHIQ_BULK_RECEIVE_DONE);
-+               status = make_service_callback(service, reason,
-+                  NULL, bulk->userdata);
-+               if (status == VCHIQ_RETRY)
-+                  break;
-+            }
-+         }
-+
-+         queue->remove++;
-+         vcos_event_signal(&service->bulk_remove_event);
-+      }
-+   }
-+
-+   if (status != VCHIQ_SUCCESS)
-+      request_poll(service->state, service, (queue == &service->bulk_tx) ?
-+         VCHIQ_POLL_TXNOTIFY : VCHIQ_POLL_RXNOTIFY);
- 
--	return status;
-+   return status;
- }
- 
- /* Called by the slot handler thread */
- static void
- poll_services(VCHIQ_STATE_T *state)
- {
--	int group, i;
-+   int group, i;
- 
--	for (group = 0; group < BITSET_SIZE(state->unused_service); group++) {
--		uint32_t flags;
--		flags = atomic_xchg(&state->poll_services[group], 0);
--		for (i = 0; flags; i++) {
--			if (flags & (1 << i)) {
--				VCHIQ_SERVICE_T *service =
--					find_service_by_port(state,
--						(group<<5) + i);
--				uint32_t service_flags;
--				flags &= ~(1 << i);
--				if (!service)
--					continue;
--				service_flags =
--					atomic_xchg(&service->poll_flags, 0);
--				if (service_flags &
--					(1 << VCHIQ_POLL_TERMINATE)) {
--					vchiq_log_info(vchiq_core_log_level,
--						"%d: ps - terminate %d<->%d",
--						state->id, service->localport,
--						service->remoteport);
--					if (vchiq_close_service_internal(
--						service, 0/*!close_recvd*/) !=
--						VCHIQ_SUCCESS)
--						request_poll(state, service,
--							VCHIQ_POLL_TERMINATE);
--				}
--				if (service_flags & (1 << VCHIQ_POLL_TXNOTIFY))
--					notify_bulks(service,
--						&service->bulk_tx,
--						1/*retry_poll*/);
--				if (service_flags & (1 << VCHIQ_POLL_RXNOTIFY))
--					notify_bulks(service,
--						&service->bulk_rx,
--						1/*retry_poll*/);
--				unlock_service(service);
--			}
--		}
--	}
-+   for (group = 0; group < BITSET_SIZE(state->unused_service); group++)
-+   {
-+      uint32_t flags;
-+      flags = vcos_atomic_flags_get_and_clear(&state->poll_services[group]);
-+      for (i = 0; flags; i++)
-+      {
-+         if (flags & (1 << i))
-+         {
-+            VCHIQ_SERVICE_T *service = state->services[(group<<5) + i];
-+            uint32_t service_flags =
-+               vcos_atomic_flags_get_and_clear(&service->poll_flags);
-+            if (service_flags & (1 << VCHIQ_POLL_TERMINATE))
-+            {
-+               vcos_log_info("%d: ps - terminate %d<->%d", state->id, service->localport, service->remoteport);
-+               if (vchiq_close_service_internal(service, 0/*!close_recvd*/) != VCHIQ_SUCCESS)
-+                  request_poll(state, service, VCHIQ_POLL_TERMINATE);
-+            }
-+            if (service_flags & (1 << VCHIQ_POLL_TXNOTIFY))
-+               notify_bulks(service, &service->bulk_tx);
-+            if (service_flags & (1 << VCHIQ_POLL_RXNOTIFY))
-+               notify_bulks(service, &service->bulk_rx);
-+            flags &= ~(1 << i);
-+         }
-+      }
-+   }
- }
- 
- /* Called by the slot handler or application threads, holding the bulk mutex. */
- static int
- resolve_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
- {
--	VCHIQ_STATE_T *state = service->state;
--	int resolved = 0;
-+   VCHIQ_STATE_T *state = service->state;
-+   int resolved = 0;
- 
--	while ((queue->process != queue->local_insert) &&
--		(queue->process != queue->remote_insert)) {
--		VCHIQ_BULK_T *bulk = &queue->bulks[BULK_INDEX(queue->process)];
--
--		vchiq_log_trace(vchiq_core_log_level,
--			"%d: rb:%d %cx - li=%x ri=%x p=%x",
--			state->id, service->localport,
--			(queue == &service->bulk_tx) ? 't' : 'r',
--			queue->local_insert, queue->remote_insert,
--			queue->process);
--
--		WARN_ON(!((int)(queue->local_insert - queue->process) > 0));
--		WARN_ON(!((int)(queue->remote_insert - queue->process) > 0));
--
--		mutex_lock(&state->bulk_transfer_mutex);
--		vchiq_transfer_bulk(bulk);
--		mutex_unlock(&state->bulk_transfer_mutex);
--
--		if (vchiq_core_msg_log_level >= VCHIQ_LOG_INFO) {
--			const char *header = (queue == &service->bulk_tx) ?
--				"Send Bulk to" : "Recv Bulk from";
--			if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED)
--				vchiq_log_info(vchiq_core_msg_log_level,
--					"%s %c%c%c%c d:%d len:%d %x<->%x",
--					header,
--					VCHIQ_FOURCC_AS_4CHARS(
--						service->base.fourcc),
--					service->remoteport,
--					bulk->size,
--					(unsigned int)bulk->data,
--					(unsigned int)bulk->remote_data);
--			else
--				vchiq_log_info(vchiq_core_msg_log_level,
--					"%s %c%c%c%c d:%d ABORTED - tx len:%d,"
--					" rx len:%d %x<->%x",
--					header,
--					VCHIQ_FOURCC_AS_4CHARS(
--						service->base.fourcc),
--					service->remoteport,
--					bulk->size,
--					bulk->remote_size,
--					(unsigned int)bulk->data,
--					(unsigned int)bulk->remote_data);
--		}
--
--		vchiq_complete_bulk(bulk);
--		queue->process++;
--		resolved++;
--	}
--	return resolved;
-+   while ((queue->process != queue->local_insert) &&
-+      (queue->process != queue->remote_insert))
-+   {
-+      VCHIQ_BULK_T *bulk = &queue->bulks[BULK_INDEX(queue->process)];
-+
-+      vcos_log_trace("%d: rb:%d %cx - li=%x ri=%x p=%x",
-+         state->id, service->localport,
-+         (queue == &service->bulk_tx) ? 't' : 'r',
-+         queue->local_insert, queue->remote_insert,
-+         queue->process);
-+
-+      vcos_assert((int)(queue->local_insert - queue->process) > 0);
-+      vcos_assert((int)(queue->remote_insert - queue->process) > 0);
-+      vchiq_transfer_bulk(bulk);
-+
-+      if (vcos_is_log_enabled( &vchiq_core_msg_log_category, VCOS_LOG_INFO))
-+      {
-+         const char *header = (queue == &service->bulk_tx) ?
-+            "Send Bulk to" : "Recv Bulk from";
-+         if (bulk->actual != VCHIQ_BULK_ACTUAL_ABORTED)
-+            vcos_log_impl( &vchiq_core_msg_log_category,
-+               VCOS_LOG_INFO,
-+               "%s %c%c%c%c d:%d len:%d %x<->%x",
-+               header,
-+               VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
-+               service->remoteport,
-+               bulk->size,
-+               (unsigned int)bulk->data,
-+               (unsigned int)bulk->remote_data );
-+         else
-+            vcos_log_impl( &vchiq_core_msg_log_category,
-+               VCOS_LOG_INFO,
-+               "%s %c%c%c%c d:%d ABORTED - tx len:%d, rx len:%d %x<->%x",
-+               header,
-+               VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
-+               service->remoteport,
-+               bulk->size,
-+               bulk->remote_size,
-+               (unsigned int)bulk->data,
-+               (unsigned int)bulk->remote_data );
-+      }
-+
-+      vchiq_complete_bulk(bulk);
-+      queue->process++;
-+      resolved++;
-+   }
-+   return resolved;
- }
- 
- /* Called with the bulk_mutex held */
- static void
- abort_outstanding_bulks(VCHIQ_SERVICE_T *service, VCHIQ_BULK_QUEUE_T *queue)
- {
--	int is_tx = (queue == &service->bulk_tx);
--	vchiq_log_trace(vchiq_core_log_level,
--		"%d: aob:%d %cx - li=%x ri=%x p=%x",
--		service->state->id, service->localport, is_tx ? 't' : 'r',
--		queue->local_insert, queue->remote_insert, queue->process);
--
--	WARN_ON(!((int)(queue->local_insert - queue->process) >= 0));
--	WARN_ON(!((int)(queue->remote_insert - queue->process) >= 0));
--
--	while ((queue->process != queue->local_insert) ||
--		(queue->process != queue->remote_insert)) {
--		VCHIQ_BULK_T *bulk = &queue->bulks[BULK_INDEX(queue->process)];
--
--		if (queue->process == queue->remote_insert) {
--			/* fabricate a matching dummy bulk */
--			bulk->remote_data = NULL;
--			bulk->remote_size = 0;
--			queue->remote_insert++;
--		}
--
--		if (queue->process != queue->local_insert) {
--			vchiq_complete_bulk(bulk);
--
--			vchiq_log_info(vchiq_core_msg_log_level,
--				"%s %c%c%c%c d:%d ABORTED - tx len:%d, "
--				"rx len:%d",
--				is_tx ? "Send Bulk to" : "Recv Bulk from",
--				VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
--				service->remoteport,
--				bulk->size,
--				bulk->remote_size);
--		} else {
--			/* fabricate a matching dummy bulk */
--			bulk->data = NULL;
--			bulk->size = 0;
--			bulk->actual = VCHIQ_BULK_ACTUAL_ABORTED;
--			bulk->dir = is_tx ? VCHIQ_BULK_TRANSMIT :
--				VCHIQ_BULK_RECEIVE;
--			queue->local_insert++;
--		}
-+   int is_tx = (queue == &service->bulk_tx);
-+   vcos_log_trace("%d: aob:%d %cx - li=%x ri=%x p=%x",
-+      service->state->id, service->localport, is_tx ? 't' : 'r',
-+      queue->local_insert, queue->remote_insert, queue->process);
-+
-+   vcos_assert((int)(queue->local_insert - queue->process) >= 0);
-+   vcos_assert((int)(queue->remote_insert - queue->process) >= 0);
-+
-+   while ((queue->process != queue->local_insert) ||
-+      (queue->process != queue->remote_insert))
-+   {
-+      VCHIQ_BULK_T *bulk = &queue->bulks[BULK_INDEX(queue->process)];
-+
-+      if (queue->process == queue->remote_insert)
-+      {
-+         /* fabricate a matching dummy bulk */
-+         bulk->remote_data = NULL;
-+         bulk->remote_size = 0;
-+         queue->remote_insert++;
-+      }
-+
-+      if (queue->process != queue->local_insert)
-+      {
-+         vchiq_complete_bulk(bulk);
-+
-+         if (vcos_is_log_enabled( &vchiq_core_msg_log_category, VCOS_LOG_INFO))
-+         {
-+            vcos_log_impl( &vchiq_core_msg_log_category,
-+               VCOS_LOG_INFO,
-+               "%s %c%c%c%c d:%d ABORTED - tx len:%d, rx len:%d",
-+               is_tx ? "Send Bulk to" : "Recv Bulk from",
-+               VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
-+               service->remoteport,
-+               bulk->size,
-+               bulk->remote_size );
-+         }
-+      }
-+      else
-+      {
-+         /* fabricate a matching dummy bulk */
-+         bulk->data = NULL;
-+         bulk->size = 0;
-+         bulk->actual = VCHIQ_BULK_ACTUAL_ABORTED;
-+         bulk->dir = is_tx ? VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;
-+         queue->local_insert++;
-+      }
- 
--		queue->process++;
--	}
-+      queue->process++;
-+   }
- }
- 
--/* Called from the slot handler thread */
- static void
- pause_bulks(VCHIQ_STATE_T *state)
- {
--	if (unlikely(atomic_inc_return(&pause_bulks_count) != 1)) {
--		WARN_ON_ONCE(1);
--		atomic_set(&pause_bulks_count, 1);
--		return;
--	}
-+   int i;
- 
--	/* Block bulk transfers from all services */
--	mutex_lock(&state->bulk_transfer_mutex);
-+   /* Block bulk transfers from all services */
-+   for (i = 0; i < state->unused_service; i++)
-+   {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      if (!service || (service->srvstate != VCHIQ_SRVSTATE_OPEN))
-+         continue;
-+
-+      vcos_log_trace("locking bulk_mutex for service %d", i);
-+      vcos_mutex_lock(&service->bulk_mutex);
-+   }
- }
- 
--/* Called from the slot handler thread */
- static void
- resume_bulks(VCHIQ_STATE_T *state)
- {
--	if (unlikely(atomic_dec_return(&pause_bulks_count) != 0)) {
--		WARN_ON_ONCE(1);
--		atomic_set(&pause_bulks_count, 0);
--		return;
--	}
-+   int i;
- 
--	/* Allow bulk transfers from all services */
--	mutex_unlock(&state->bulk_transfer_mutex);
--}
--
--static int
--parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header)
--{
--	VCHIQ_SERVICE_T *service = NULL;
--	int msgid, size;
--	int type;
--	unsigned int localport, remoteport;
--
--	msgid = header->msgid;
--	size = header->size;
--	type = VCHIQ_MSG_TYPE(msgid);
--	localport = VCHIQ_MSG_DSTPORT(msgid);
--	remoteport = VCHIQ_MSG_SRCPORT(msgid);
--	if (size == sizeof(struct vchiq_open_payload)) {
--		const struct vchiq_open_payload *payload =
--			(struct vchiq_open_payload *)header->data;
--		unsigned int fourcc;
--
--		fourcc = payload->fourcc;
--		vchiq_log_info(vchiq_core_log_level,
--			"%d: prs OPEN@%x (%d->'%c%c%c%c')",
--			state->id, (unsigned int)header,
--			localport,
--			VCHIQ_FOURCC_AS_4CHARS(fourcc));
--
--		service = get_listening_service(state, fourcc);
--
--		if (service) {
--			/* A matching service exists */
--			short version = payload->version;
--			short version_min = payload->version_min;
--			if ((service->version < version_min) ||
--				(version < service->version_min)) {
--				/* Version mismatch */
--				vchiq_loud_error_header();
--				vchiq_loud_error("%d: service %d (%c%c%c%c) "
--					"version mismatch - local (%d, min %d)"
--					" vs. remote (%d, min %d)",
--					state->id, service->localport,
--					VCHIQ_FOURCC_AS_4CHARS(fourcc),
--					service->version, service->version_min,
--					version, version_min);
--				vchiq_loud_error_footer();
--				goto fail_open;
--			}
--			if (service->srvstate == VCHIQ_SRVSTATE_LISTENING) {
--				/* Acknowledge the OPEN */
--				if (service->sync) {
--					if (queue_message_sync(state, NULL,
--						VCHIQ_MAKE_MSG(
--							VCHIQ_MSG_OPENACK,
--							service->localport,
--							remoteport),
--						NULL, 0, 0, 0) == VCHIQ_RETRY)
--						goto bail_not_ready;
--				} else {
--					if (queue_message(state, NULL,
--						VCHIQ_MAKE_MSG(
--							VCHIQ_MSG_OPENACK,
--							service->localport,
--							remoteport),
--						NULL, 0, 0, 0) == VCHIQ_RETRY)
--						goto bail_not_ready;
--				}
--
--				/* The service is now open */
--				vchiq_set_service_state(service,
--					service->sync ? VCHIQ_SRVSTATE_OPENSYNC
--					: VCHIQ_SRVSTATE_OPEN);
--			}
--
--			service->remoteport = remoteport;
--			service->client_id = ((int *)header->data)[1];
--			if (make_service_callback(service, VCHIQ_SERVICE_OPENED,
--				NULL, NULL) == VCHIQ_RETRY) {
--				/* Bail out if not ready */
--				service->remoteport = VCHIQ_PORT_FREE;
--				goto bail_not_ready;
--			}
--
--			/* Success - the message has been dealt with */
--			unlock_service(service);
--			return 1;
--		}
--	}
--
--fail_open:
--	/* No available service, or an invalid request - send a CLOSE */
--	if (queue_message(state, NULL,
--		VCHIQ_MAKE_MSG(VCHIQ_MSG_CLOSE, 0, VCHIQ_MSG_SRCPORT(msgid)),
--		NULL, 0, 0, 0) == VCHIQ_RETRY)
--		goto bail_not_ready;
--
--	return 1;
--
--bail_not_ready:
--	unlock_service(service);
--
--	return 0;
-+   /* Poll all services in case any bulk transfers have been
-+      deferred */
-+   for (i = 0; i < state->unused_service; i++)
-+   {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      if (!service || (service->srvstate != VCHIQ_SRVSTATE_OPEN))
-+         continue;
-+
-+      if (resolve_bulks(service, &service->bulk_tx))
-+         request_poll(state, service, VCHIQ_POLL_TXNOTIFY);
-+      if (resolve_bulks(service, &service->bulk_rx))
-+         request_poll(state, service, VCHIQ_POLL_RXNOTIFY);
-+      vcos_log_trace("unlocking bulk_mutex for service %d", i);
-+      vcos_mutex_unlock(&service->bulk_mutex);
-+   }
- }
- 
- /* Called by the slot handler thread */
- static void
- parse_rx_slots(VCHIQ_STATE_T *state)
- {
--	VCHIQ_SHARED_STATE_T *remote = state->remote;
--	VCHIQ_SERVICE_T *service = NULL;
--	int tx_pos;
--	DEBUG_INITIALISE(state->local)
--
--	tx_pos = remote->tx_pos;
--
--	while (state->rx_pos != tx_pos) {
--		VCHIQ_HEADER_T *header;
--		int msgid, size;
--		int type;
--		unsigned int localport, remoteport;
--
--		DEBUG_TRACE(PARSE_LINE);
--		if (!state->rx_data) {
--			int rx_index;
--			WARN_ON(!((state->rx_pos & VCHIQ_SLOT_MASK) == 0));
--			rx_index = remote->slot_queue[
--				SLOT_QUEUE_INDEX_FROM_POS(state->rx_pos) &
--				VCHIQ_SLOT_QUEUE_MASK];
--			state->rx_data = (char *)SLOT_DATA_FROM_INDEX(state,
--				rx_index);
--			state->rx_info = SLOT_INFO_FROM_INDEX(state, rx_index);
--
--			/* Initialise use_count to one, and increment
--			** release_count at the end of the slot to avoid
--			** releasing the slot prematurely. */
--			state->rx_info->use_count = 1;
--			state->rx_info->release_count = 0;
--		}
--
--		header = (VCHIQ_HEADER_T *)(state->rx_data +
--			(state->rx_pos & VCHIQ_SLOT_MASK));
--		DEBUG_VALUE(PARSE_HEADER, (int)header);
--		msgid = header->msgid;
--		DEBUG_VALUE(PARSE_MSGID, msgid);
--		size = header->size;
--		type = VCHIQ_MSG_TYPE(msgid);
--		localport = VCHIQ_MSG_DSTPORT(msgid);
--		remoteport = VCHIQ_MSG_SRCPORT(msgid);
--
--		if (type != VCHIQ_MSG_DATA)
--			VCHIQ_STATS_INC(state, ctrl_rx_count);
--
--		switch (type) {
--		case VCHIQ_MSG_OPENACK:
--		case VCHIQ_MSG_CLOSE:
--		case VCHIQ_MSG_DATA:
--		case VCHIQ_MSG_BULK_RX:
--		case VCHIQ_MSG_BULK_TX:
--		case VCHIQ_MSG_BULK_RX_DONE:
--		case VCHIQ_MSG_BULK_TX_DONE:
--			service = find_service_by_port(state, localport);
--			if (!service) {
--				vchiq_log_error(vchiq_core_log_level,
--					"%d: prs %s@%x (%d->%d) - "
--					"invalid/closed service %d",
--					state->id, msg_type_str(type),
--					(unsigned int)header,
--					remoteport, localport, localport);
--				goto skip_message;
--			}
--		default:
--			break;
--		}
--
--		if (vchiq_core_msg_log_level >= VCHIQ_LOG_INFO) {
--			int svc_fourcc;
--
--			svc_fourcc = service
--				? service->base.fourcc
--				: VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
--			vchiq_log_info(vchiq_core_msg_log_level,
--				"Rcvd Msg %s(%u) from %c%c%c%c s:%d d:%d "
--				"len:%d",
--				msg_type_str(type), type,
--				VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
--				remoteport, localport, size);
--			if (size > 0)
--				vchiq_log_dump_mem("Rcvd", 0, header->data,
--					min(64, size));
--		}
--
--		if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size)
--			> VCHIQ_SLOT_SIZE) {
--			vchiq_log_error(vchiq_core_log_level,
--				"header %x (msgid %x) - size %x too big for "
--				"slot",
--				(unsigned int)header, (unsigned int)msgid,
--				(unsigned int)size);
--			WARN(1, "oversized for slot\n");
--		}
--
--		switch (type) {
--		case VCHIQ_MSG_OPEN:
--			WARN_ON(!(VCHIQ_MSG_DSTPORT(msgid) == 0));
--			if (!parse_open(state, header))
--				goto bail_not_ready;
--			break;
--		case VCHIQ_MSG_OPENACK:
--			vchiq_log_info(vchiq_core_log_level,
--				"%d: prs OPENACK@%x (%d->%d)",
--				state->id, (unsigned int)header,
--				remoteport, localport);
--			if (service->srvstate ==
--				VCHIQ_SRVSTATE_OPENING) {
--				service->remoteport = remoteport;
--				vchiq_set_service_state(service,
--					VCHIQ_SRVSTATE_OPEN);
--				up(&service->remove_event);
--			} else
--				vchiq_log_error(vchiq_core_log_level,
--					"OPENACK received in state %s",
--					srvstate_names[service->srvstate]);
--			break;
--		case VCHIQ_MSG_CLOSE:
--			WARN_ON(size != 0); /* There should be no data */
--
--			vchiq_log_info(vchiq_core_log_level,
--				"%d: prs CLOSE@%x (%d->%d)",
--				state->id, (unsigned int)header,
--				remoteport, localport);
--
--			if ((service->remoteport != remoteport) &&
--				VCHIQ_PORT_IS_VALID(service->remoteport)) {
--				/* This could be from a client which hadn't yet
--				** received the OPENACK - look for the
--				** connected service */
--				service = get_connected_service(state,
--					remoteport);
--				if (!service)
--					break;
--			}
--
--			mark_service_closing(service);
--
--			if (vchiq_close_service_internal(service,
--				1/*close_recvd*/) == VCHIQ_RETRY)
--				goto bail_not_ready;
--
--			vchiq_log_info(vchiq_core_log_level,
--				"Close Service %c%c%c%c s:%u d:%d",
--				VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
--				service->localport,
--				service->remoteport);
--			break;
--		case VCHIQ_MSG_DATA:
--			vchiq_log_trace(vchiq_core_log_level,
--				"%d: prs DATA@%x,%x (%d->%d)",
--				state->id, (unsigned int)header, size,
--				remoteport, localport);
--
--			if ((service->remoteport == remoteport)
--				&& (service->srvstate ==
--				VCHIQ_SRVSTATE_OPEN)) {
--				header->msgid = msgid | VCHIQ_MSGID_CLAIMED;
--				claim_slot(state->rx_info);
--				DEBUG_TRACE(PARSE_LINE);
--				if (make_service_callback(service,
--					VCHIQ_MESSAGE_AVAILABLE, header,
--					NULL) == VCHIQ_RETRY) {
--					DEBUG_TRACE(PARSE_LINE);
--					goto bail_not_ready;
--				}
--				VCHIQ_SERVICE_STATS_INC(service, ctrl_rx_count);
--				VCHIQ_SERVICE_STATS_ADD(service, ctrl_rx_bytes,
--					size);
--			} else {
--				VCHIQ_STATS_INC(state, error_count);
--			}
--			break;
--		case VCHIQ_MSG_CONNECT:
--			vchiq_log_info(vchiq_core_log_level,
--				"%d: prs CONNECT@%x",
--				state->id, (unsigned int)header);
--			up(&state->connect);
--			break;
--		case VCHIQ_MSG_BULK_RX:
--		case VCHIQ_MSG_BULK_TX: {
--			VCHIQ_BULK_QUEUE_T *queue;
--			WARN_ON(!state->is_master);
--			queue = (type == VCHIQ_MSG_BULK_RX) ?
--				&service->bulk_tx : &service->bulk_rx;
--			if ((service->remoteport == remoteport)
--				&& (service->srvstate ==
--				VCHIQ_SRVSTATE_OPEN)) {
--				VCHIQ_BULK_T *bulk;
--				int resolved = 0;
--
--				DEBUG_TRACE(PARSE_LINE);
--				if (mutex_lock_interruptible(
--					&service->bulk_mutex) != 0) {
--					DEBUG_TRACE(PARSE_LINE);
--					goto bail_not_ready;
--				}
--
--				WARN_ON(!(queue->remote_insert < queue->remove +
--					VCHIQ_NUM_SERVICE_BULKS));
--				bulk = &queue->bulks[
--					BULK_INDEX(queue->remote_insert)];
--				bulk->remote_data =
--					(void *)((int *)header->data)[0];
--				bulk->remote_size = ((int *)header->data)[1];
--				wmb();
--
--				vchiq_log_info(vchiq_core_log_level,
--					"%d: prs %s@%x (%d->%d) %x@%x",
--					state->id, msg_type_str(type),
--					(unsigned int)header,
--					remoteport, localport,
--					bulk->remote_size,
--					(unsigned int)bulk->remote_data);
--
--				queue->remote_insert++;
--
--				if (state->conn_state ==
--					VCHIQ_CONNSTATE_CONNECTED) {
--					DEBUG_TRACE(PARSE_LINE);
--					resolved = resolve_bulks(service, queue);
--				}
--
--				mutex_unlock(&service->bulk_mutex);
--				if (resolved)
--					notify_bulks(service, queue,
--						1/*retry_poll*/);
--			}
--		} break;
--		case VCHIQ_MSG_BULK_RX_DONE:
--		case VCHIQ_MSG_BULK_TX_DONE:
--			WARN_ON(state->is_master);
--			if ((service->remoteport == remoteport)
--				&& (service->srvstate !=
--				VCHIQ_SRVSTATE_FREE)) {
--				VCHIQ_BULK_QUEUE_T *queue;
--				VCHIQ_BULK_T *bulk;
--
--				queue = (type == VCHIQ_MSG_BULK_RX_DONE) ?
--					&service->bulk_rx : &service->bulk_tx;
--
--				DEBUG_TRACE(PARSE_LINE);
--				if (mutex_lock_interruptible(
--					&service->bulk_mutex) != 0) {
--					DEBUG_TRACE(PARSE_LINE);
--					goto bail_not_ready;
--				}
--				if ((int)(queue->remote_insert -
--					queue->local_insert) >= 0) {
--					vchiq_log_error(vchiq_core_log_level,
--						"%d: prs %s@%x (%d->%d) "
--						"unexpected (ri=%d,li=%d)",
--						state->id, msg_type_str(type),
--						(unsigned int)header,
--						remoteport, localport,
--						queue->remote_insert,
--						queue->local_insert);
--					mutex_unlock(&service->bulk_mutex);
--					break;
--				}
--
--				BUG_ON(queue->process == queue->local_insert);
--				BUG_ON(queue->process != queue->remote_insert);
--
--				bulk = &queue->bulks[
--					BULK_INDEX(queue->remote_insert)];
--				bulk->actual = *(int *)header->data;
--				queue->remote_insert++;
--
--				vchiq_log_info(vchiq_core_log_level,
--					"%d: prs %s@%x (%d->%d) %x@%x",
--					state->id, msg_type_str(type),
--					(unsigned int)header,
--					remoteport, localport,
--					bulk->actual, (unsigned int)bulk->data);
--
--				vchiq_log_trace(vchiq_core_log_level,
--					"%d: prs:%d %cx li=%x ri=%x p=%x",
--					state->id, localport,
--					(type == VCHIQ_MSG_BULK_RX_DONE) ?
--						'r' : 't',
--					queue->local_insert,
--					queue->remote_insert, queue->process);
--
--				DEBUG_TRACE(PARSE_LINE);
--				WARN_ON(queue->process == queue->local_insert);
--				vchiq_complete_bulk(bulk);
--				queue->process++;
--				mutex_unlock(&service->bulk_mutex);
--				DEBUG_TRACE(PARSE_LINE);
--				notify_bulks(service, queue, 1/*retry_poll*/);
--				DEBUG_TRACE(PARSE_LINE);
--			}
--			break;
--		case VCHIQ_MSG_PADDING:
--			vchiq_log_trace(vchiq_core_log_level,
--				"%d: prs PADDING@%x,%x",
--				state->id, (unsigned int)header, size);
--			break;
--		case VCHIQ_MSG_PAUSE:
--			/* If initiated, signal the application thread */
--			vchiq_log_trace(vchiq_core_log_level,
--				"%d: prs PAUSE@%x,%x",
--				state->id, (unsigned int)header, size);
--			if (state->conn_state == VCHIQ_CONNSTATE_PAUSED) {
--				vchiq_log_error(vchiq_core_log_level,
--					"%d: PAUSE received in state PAUSED",
--					state->id);
--				break;
--			}
--			if (state->conn_state != VCHIQ_CONNSTATE_PAUSE_SENT) {
--				/* Send a PAUSE in response */
--				if (queue_message(state, NULL,
--					VCHIQ_MAKE_MSG(VCHIQ_MSG_PAUSE, 0, 0),
--					NULL, 0, 0, 0) == VCHIQ_RETRY)
--					goto bail_not_ready;
--				if (state->is_master)
--					pause_bulks(state);
--			}
--			/* At this point slot_mutex is held */
--			vchiq_set_conn_state(state, VCHIQ_CONNSTATE_PAUSED);
--			vchiq_platform_paused(state);
--			break;
--		case VCHIQ_MSG_RESUME:
--			vchiq_log_trace(vchiq_core_log_level,
--				"%d: prs RESUME@%x,%x",
--				state->id, (unsigned int)header, size);
--			/* Release the slot mutex */
--			mutex_unlock(&state->slot_mutex);
--			if (state->is_master)
--				resume_bulks(state);
--			vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED);
--			vchiq_platform_resumed(state);
--			break;
--
--		case VCHIQ_MSG_REMOTE_USE:
--			vchiq_on_remote_use(state);
--			break;
--		case VCHIQ_MSG_REMOTE_RELEASE:
--			vchiq_on_remote_release(state);
--			break;
--		case VCHIQ_MSG_REMOTE_USE_ACTIVE:
--			vchiq_on_remote_use_active(state);
--			break;
--
--		default:
--			vchiq_log_error(vchiq_core_log_level,
--				"%d: prs invalid msgid %x@%x,%x",
--				state->id, msgid, (unsigned int)header, size);
--			WARN(1, "invalid message\n");
--			break;
--		}
--
--skip_message:
--		if (service) {
--			unlock_service(service);
--			service = NULL;
--		}
--
--		state->rx_pos += calc_stride(size);
--
--		DEBUG_TRACE(PARSE_LINE);
--		/* Perform some housekeeping when the end of the slot is
--		** reached. */
--		if ((state->rx_pos & VCHIQ_SLOT_MASK) == 0) {
--			/* Remove the extra reference count. */
--			release_slot(state, state->rx_info, NULL, NULL);
--			state->rx_data = NULL;
--		}
--	}
--
--bail_not_ready:
--	if (service)
--		unlock_service(service);
-+   VCHIQ_SHARED_STATE_T *remote = state->remote;
-+   int tx_pos;
-+   DEBUG_INITIALISE(state->local)
-+
-+   tx_pos = remote->tx_pos;
-+
-+   while (state->rx_pos != tx_pos) {
-+      VCHIQ_SERVICE_T *service = NULL;
-+      VCHIQ_HEADER_T *header;
-+      int msgid, size;
-+      int type;
-+      unsigned int localport, remoteport;
-+
-+      DEBUG_TRACE(PARSE_LINE);
-+      if (!state->rx_data)
-+      {
-+         int rx_index;
-+         vcos_assert((state->rx_pos & VCHIQ_SLOT_MASK) == 0);
-+         rx_index = remote->slot_queue[SLOT_QUEUE_INDEX_FROM_POS(state->rx_pos) & VCHIQ_SLOT_QUEUE_MASK];
-+         state->rx_data = (char *)SLOT_DATA_FROM_INDEX(state, rx_index);
-+         state->rx_info = SLOT_INFO_FROM_INDEX(state, rx_index);
-+
-+         /* Initialise use_count to one, and increment release_count at the end
-+            of the slot to avoid releasing the slot prematurely. */
-+         state->rx_info->use_count = 1;
-+         state->rx_info->release_count = 0;
-+      }
-+
-+      header = (VCHIQ_HEADER_T *)(state->rx_data + (state->rx_pos & VCHIQ_SLOT_MASK));
-+      DEBUG_VALUE(PARSE_HEADER, (int)header);
-+      msgid = header->msgid;
-+      DEBUG_VALUE(PARSE_MSGID, msgid);
-+      size = header->size;
-+      type = VCHIQ_MSG_TYPE(msgid);
-+      localport = VCHIQ_MSG_DSTPORT(msgid);
-+      remoteport = VCHIQ_MSG_SRCPORT(msgid);
-+
-+      if (type != VCHIQ_MSG_DATA)
-+      {
-+         VCHIQ_STATS_INC(state, ctrl_rx_count);
-+      }
-+
-+      switch (type)
-+      {
-+      case VCHIQ_MSG_OPENACK:
-+      case VCHIQ_MSG_CLOSE:
-+      case VCHIQ_MSG_DATA:
-+      case VCHIQ_MSG_BULK_RX:
-+      case VCHIQ_MSG_BULK_TX:
-+      case VCHIQ_MSG_BULK_RX_DONE:
-+      case VCHIQ_MSG_BULK_TX_DONE:
-+         if (localport <= VCHIQ_PORT_MAX)
-+         {
-+            service = state->services[localport];
-+            if (service && (service->srvstate == VCHIQ_SRVSTATE_FREE))
-+               service = NULL;
-+         }
-+         if (!service)
-+         {
-+            vcos_log_error(
-+               "%d: prs %s@%x (%d->%d) - invalid/closed service %d",
-+               state->id, msg_type_str(type), (unsigned int)header,
-+               remoteport, localport, localport);
-+            goto skip_message;
-+         }
-+      default:
-+         break;
-+      }
-+
-+      if ( vcos_is_log_enabled( &vchiq_core_msg_log_category, VCOS_LOG_INFO))
-+      {
-+         int svc_fourcc;
-+
-+         svc_fourcc = service
-+            ? service->base.fourcc
-+            : VCHIQ_MAKE_FOURCC('?','?','?','?');
-+         vcos_log_impl( &vchiq_core_msg_log_category,
-+            VCOS_LOG_INFO,
-+            "Rcvd Msg %s(%u) from %c%c%c%c s:%d d:%d len:%d",
-+            msg_type_str(type), type,
-+            VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
-+            remoteport, localport, size );
-+         if (size > 0) {
-+            vcos_log_dump_mem( &vchiq_core_msg_log_category,
-+                           "Rcvd", 0, header->data,
-+                           vcos_min( 64, size ));
-+         }
-+      }
-+
-+      if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size) > VCHIQ_SLOT_SIZE)
-+      {
-+         vcos_log_error("header %x (msgid %x) - size %x too big for slot",
-+            (unsigned int)header, (unsigned int)msgid, (unsigned int)size);
-+         vcos_assert(0);
-+      }
-+
-+      switch (type) {
-+      case VCHIQ_MSG_OPEN:
-+         vcos_assert(VCHIQ_MSG_DSTPORT(msgid) == 0);
-+         if (vcos_verify(size == sizeof(VCHIQ_OPEN_PAYLOAD_T))) {
-+            const VCHIQ_OPEN_PAYLOAD_T *payload = (VCHIQ_OPEN_PAYLOAD_T *)header->data;
-+            unsigned int fourcc;
-+
-+            fourcc = payload->fourcc;
-+            vcos_log_info("%d: prs OPEN@%x (%d->'%c%c%c%c')",
-+               state->id, (unsigned int)header,
-+               localport,
-+               VCHIQ_FOURCC_AS_4CHARS(fourcc));
-+
-+            service = get_listening_service(state, fourcc);
-+
-+            if (service)
-+            {
-+               /* A matching service exists */
-+               short version = payload->version;
-+               short version_min = payload->version_min;
-+               if ((service->version < version_min) ||
-+                  (version < service->version_min))
-+               {
-+                  /* Version mismatch */
-+                  vcos_log_error("%d: service %d (%c%c%c%c) version mismatch -"
-+                     " local (%d, min %d) vs. remote (%d, min %d)",
-+                     state->id, service->localport,
-+                     VCHIQ_FOURCC_AS_4CHARS(fourcc),
-+                     service->version, service->version_min,
-+                     version, version_min);
-+                  goto fail_open;
-+               }
-+               if (service->srvstate == VCHIQ_SRVSTATE_LISTENING)
-+               {
-+                  /* Acknowledge the OPEN */
-+                  if (queue_message(state, NULL,
-+                     VCHIQ_MAKE_MSG(VCHIQ_MSG_OPENACK, service->localport, remoteport),
-+                     NULL, 0, 0, 0) == VCHIQ_RETRY)
-+                     return;  /* Bail out if not ready */
-+
-+                  /* The service is now open */
-+                  vchiq_set_service_state(service, VCHIQ_SRVSTATE_OPEN);
-+               }
-+
-+               service->remoteport = remoteport;
-+               service->client_id = ((int *)header->data)[1];
-+               if (make_service_callback(service, VCHIQ_SERVICE_OPENED,
-+                  NULL, NULL) == VCHIQ_RETRY)
-+               {
-+                  /* Bail out if not ready */
-+                  service->remoteport = VCHIQ_PORT_FREE;
-+                  return;
-+               }
-+
-+               /* Break out, and skip the failure handling */
-+               break;
-+            }
-+         }
-+      fail_open:
-+         /* No available service, or an invalid request - send a CLOSE */
-+         if (queue_message(state, NULL,
-+            VCHIQ_MAKE_MSG(VCHIQ_MSG_CLOSE, 0, VCHIQ_MSG_SRCPORT(msgid)),
-+            NULL, 0, 0, 0) == VCHIQ_RETRY)
-+            return;  /* Bail out if not ready */
-+         break;
-+      case VCHIQ_MSG_OPENACK:
-+         {
-+            vcos_log_info("%d: prs OPENACK@%x (%d->%d)",
-+               state->id, (unsigned int)header,
-+               remoteport, localport);
-+            if (service->srvstate == VCHIQ_SRVSTATE_OPENING) {
-+               service->remoteport = remoteport;
-+               vchiq_set_service_state(service,
-+                        VCHIQ_SRVSTATE_OPEN);
-+               vcos_event_signal(&service->remove_event);
-+            }
-+         }
-+         break;
-+      case VCHIQ_MSG_CLOSE:
-+         {
-+            vcos_assert(size == 0); /* There should be no data */
-+
-+            vcos_log_info("%d: prs CLOSE@%x (%d->%d)",
-+               state->id, (unsigned int)header,
-+               remoteport, localport);
-+
-+            if ((service->remoteport != remoteport) &&
-+               VCHIQ_PORT_IS_VALID(service->remoteport)) {
-+               /* This could be from a client which hadn't yet received
-+                  the OPENACK - look for the connected service */
-+               service = get_connected_service(state, remoteport);
-+               if (!service)
-+                  break;
-+            }
-+
-+            if (vchiq_close_service_internal(service,
-+               1/*close_recvd*/) == VCHIQ_RETRY)
-+               return;  /* Bail out if not ready */
-+
-+            if (vcos_is_log_enabled( &vchiq_core_msg_log_category, VCOS_LOG_INFO))
-+            {
-+               vcos_log_impl( &vchiq_core_msg_log_category,
-+                           VCOS_LOG_INFO,
-+                           "Close Service %c%c%c%c s:%u d:%d",
-+                           VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
-+                           service->localport,
-+                           service->remoteport );
-+            }
-+         }
-+         break;
-+      case VCHIQ_MSG_DATA:
-+         {
-+            vcos_log_trace("%d: prs DATA@%x,%x (%d->%d)",
-+               state->id, (unsigned int)header, size,
-+               remoteport, localport);
-+
-+            if ((service->remoteport == remoteport)
-+               && (service->srvstate ==
-+               VCHIQ_SRVSTATE_OPEN)) {
-+               header->msgid = msgid | VCHIQ_MSGID_CLAIMED;
-+               claim_slot(state->rx_info);
-+               DEBUG_TRACE(PARSE_LINE);
-+               if (make_service_callback(service,
-+                  VCHIQ_MESSAGE_AVAILABLE, header,
-+                  NULL) == VCHIQ_RETRY)
-+               {
-+                  DEBUG_TRACE(PARSE_LINE);
-+                  return;  /* Bail out if not ready */
-+               }
-+               VCHIQ_SERVICE_STATS_INC(service, ctrl_rx_count);
-+               VCHIQ_SERVICE_STATS_ADD(service, ctrl_rx_bytes, size);
-+            }
-+            else
-+            {
-+               VCHIQ_STATS_INC(state, error_count);
-+            }
-+         }
-+         break;
-+      case VCHIQ_MSG_CONNECT:
-+         vcos_log_info("%d: prs CONNECT@%x",
-+            state->id, (unsigned int)header);
-+         vcos_event_signal(&state->connect);
-+         break;
-+      case VCHIQ_MSG_BULK_RX:
-+      case VCHIQ_MSG_BULK_TX:
-+         {
-+            VCHIQ_BULK_QUEUE_T *queue;
-+            vcos_assert(state->is_master);
-+            queue = (type == VCHIQ_MSG_BULK_RX) ?
-+               &service->bulk_tx : &service->bulk_rx;
-+            if ((service->remoteport == remoteport)
-+               && (service->srvstate ==
-+               VCHIQ_SRVSTATE_OPEN))
-+            {
-+               VCHIQ_BULK_T *bulk;
-+               int resolved;
-+
-+               vcos_assert(queue->remote_insert < queue->remove +
-+                  VCHIQ_NUM_SERVICE_BULKS);
-+               bulk = &queue->bulks[BULK_INDEX(queue->remote_insert)];
-+               bulk->remote_data = (void *)((int *)header->data)[0];
-+               bulk->remote_size = ((int *)header->data)[1];
-+
-+               vcos_log_info("%d: prs %s@%x (%d->%d) %x@%x",
-+                  state->id, msg_type_str(type),
-+                  (unsigned int)header,
-+                  remoteport, localport,
-+                  bulk->remote_size,
-+                  (unsigned int)bulk->remote_data);
-+
-+               queue->remote_insert++;
-+
-+               if (state->conn_state != VCHIQ_CONNSTATE_CONNECTED)
-+                  break;
-+
-+               DEBUG_TRACE(PARSE_LINE);
-+               if (vcos_mutex_lock(&service->bulk_mutex) != VCOS_SUCCESS)
-+               {
-+                  DEBUG_TRACE(PARSE_LINE);
-+                  return;
-+               }
-+               DEBUG_TRACE(PARSE_LINE);
-+               resolved = resolve_bulks(service, queue);
-+               vcos_mutex_unlock(&service->bulk_mutex);
-+               if (resolved)
-+                  notify_bulks(service, queue);
-+            }
-+         }
-+         break;
-+      case VCHIQ_MSG_BULK_RX_DONE:
-+      case VCHIQ_MSG_BULK_TX_DONE:
-+         {
-+            vcos_assert(!state->is_master);
-+            if ((service->remoteport == remoteport)
-+               && (service->srvstate !=
-+               VCHIQ_SRVSTATE_FREE)) {
-+               VCHIQ_BULK_QUEUE_T *queue;
-+               VCHIQ_BULK_T *bulk;
-+
-+               queue = (type == VCHIQ_MSG_BULK_RX_DONE) ?
-+                  &service->bulk_rx : &service->bulk_tx;
-+
-+               bulk = &queue->bulks[BULK_INDEX(queue->process)];
-+               bulk->actual = *(int *)header->data;
-+
-+               vcos_log_info("%d: prs %s@%x (%d->%d) %x@%x",
-+                  state->id, msg_type_str(type),
-+                  (unsigned int)header,
-+                  remoteport, localport,
-+                  bulk->actual, (unsigned int)bulk->data);
-+
-+               vcos_log_trace("%d: prs:%d %cx li=%x ri=%x p=%x",
-+                  state->id, localport,
-+                  (type == VCHIQ_MSG_BULK_RX_DONE) ? 'r' : 't',
-+                  queue->local_insert,
-+                  queue->remote_insert, queue->process);
-+
-+               DEBUG_TRACE(PARSE_LINE);
-+               if (vcos_mutex_lock(&service->bulk_mutex) != VCOS_SUCCESS)
-+               {
-+                  DEBUG_TRACE(PARSE_LINE);
-+                  return;
-+               }
-+               DEBUG_TRACE(PARSE_LINE);
-+               vcos_assert(queue->process != queue->local_insert);
-+               vchiq_complete_bulk(bulk);
-+               queue->process++;
-+               vcos_mutex_unlock(&service->bulk_mutex);
-+               DEBUG_TRACE(PARSE_LINE);
-+               notify_bulks(service, queue);
-+               DEBUG_TRACE(PARSE_LINE);
-+            }
-+         }
-+         break;
-+      case VCHIQ_MSG_PADDING:
-+         vcos_log_trace("%d: prs PADDING@%x,%x",
-+            state->id, (unsigned int)header, size);
-+         break;
-+      case VCHIQ_MSG_PAUSE:
-+         /* If initiated, signal the application thread */
-+         vcos_log_trace("%d: prs PAUSE@%x,%x",
-+            state->id, (unsigned int)header, size);
-+         if (state->conn_state != VCHIQ_CONNSTATE_PAUSE_SENT)
-+         {
-+            /* Send a PAUSE in response */
-+            if (queue_message(state, NULL,
-+               VCHIQ_MAKE_MSG(VCHIQ_MSG_PAUSE, 0, 0),
-+               NULL, 0, 0, 0) == VCHIQ_RETRY)
-+               return;  /* Bail out if not ready */
-+            if (state->is_master)
-+               pause_bulks(state);
-+         }
-+         /* At this point slot_mutex is held */
-+         vchiq_set_conn_state(state, VCHIQ_CONNSTATE_PAUSED);
-+         vchiq_platform_paused(state);
-+         break;
-+      case VCHIQ_MSG_RESUME:
-+         vcos_log_trace("%d: prs RESUME@%x,%x",
-+            state->id, (unsigned int)header, size);
-+         /* Release the slot mutex */
-+         vcos_mutex_unlock(&state->slot_mutex);
-+         if (state->is_master)
-+            resume_bulks(state);
-+         vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED);
-+         vchiq_platform_resumed(state);
-+         break;
-+
-+      case VCHIQ_MSG_REMOTE_USE:
-+         vchiq_on_remote_use(state);
-+         break;
-+      case VCHIQ_MSG_REMOTE_RELEASE:
-+         vchiq_on_remote_release(state);
-+         break;
-+      case VCHIQ_MSG_REMOTE_USE_ACTIVE:
-+         vchiq_on_remote_use_active(state);
-+         break;
-+
-+      default:
-+         vcos_log_error("%d: prs invalid msgid %x@%x,%x",
-+            state->id, msgid, (unsigned int)header, size);
-+         vcos_assert(0);
-+         break;
-+      }
-+
-+   skip_message:
-+      state->rx_pos += calc_stride(size);
-+
-+      DEBUG_TRACE(PARSE_LINE);
-+      /* Perform some housekeeping when the end of the slot is reached. */
-+      if ((state->rx_pos & VCHIQ_SLOT_MASK) == 0)
-+      {
-+         /* Remove the extra reference count. */
-+         release_slot(state, state->rx_info);
-+         state->rx_data = NULL;
-+      }
-+   }
- }
- 
- /* Called by the slot handler thread */
--static int
-+static void *
- slot_handler_func(void *v)
- {
--	VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
--	VCHIQ_SHARED_STATE_T *local = state->local;
--	DEBUG_INITIALISE(local)
--
--	while (1) {
--		DEBUG_COUNT(SLOT_HANDLER_COUNT);
--		DEBUG_TRACE(SLOT_HANDLER_LINE);
--		remote_event_wait(&local->trigger);
--
--		rmb();
--
--		DEBUG_TRACE(SLOT_HANDLER_LINE);
--		if (state->poll_needed) {
--			/* Check if we need to suspend - may change our
--			 * conn_state */
--			vchiq_platform_check_suspend(state);
--
--			state->poll_needed = 0;
--
--			/* Handle service polling and other rare conditions here
--			** out of the mainline code */
--			switch (state->conn_state) {
--			case VCHIQ_CONNSTATE_CONNECTED:
--				/* Poll the services as requested */
--				poll_services(state);
--				break;
--
--			case VCHIQ_CONNSTATE_PAUSING:
--				if (state->is_master)
--					pause_bulks(state);
--				if (queue_message(state, NULL,
--					VCHIQ_MAKE_MSG(VCHIQ_MSG_PAUSE, 0, 0),
--					NULL, 0, 0, 0) != VCHIQ_RETRY) {
--					vchiq_set_conn_state(state,
--						VCHIQ_CONNSTATE_PAUSE_SENT);
--				} else {
--					if (state->is_master)
--						resume_bulks(state);
--					/* Retry later */
--					state->poll_needed = 1;
--				}
--				break;
--
--			case VCHIQ_CONNSTATE_PAUSED:
--				vchiq_platform_resume(state);
--				break;
--
--			case VCHIQ_CONNSTATE_RESUMING:
--				if (queue_message(state, NULL,
--					VCHIQ_MAKE_MSG(VCHIQ_MSG_RESUME, 0, 0),
--					NULL, 0, 0, 0) != VCHIQ_RETRY) {
--					if (state->is_master)
--						resume_bulks(state);
--					vchiq_set_conn_state(state,
--						VCHIQ_CONNSTATE_CONNECTED);
--					vchiq_platform_resumed(state);
--				} else {
--					/* This should really be impossible,
--					** since the PAUSE should have flushed
--					** through outstanding messages. */
--					vchiq_log_error(vchiq_core_log_level,
--						"Failed to send RESUME "
--						"message");
--					BUG();
--				}
--				break;
--			default:
--				break;
--			}
--
--
--		}
--
--		DEBUG_TRACE(SLOT_HANDLER_LINE);
--		parse_rx_slots(state);
--	}
--	return 0;
-+   VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
-+   VCHIQ_SHARED_STATE_T *local = state->local;
-+   DEBUG_INITIALISE(local)
-+
-+   while (1) {
-+      DEBUG_COUNT(SLOT_HANDLER_COUNT);
-+      DEBUG_TRACE(SLOT_HANDLER_LINE);
-+      remote_event_wait(&local->trigger);
-+
-+      vcos_rmb();
-+
-+      DEBUG_TRACE(SLOT_HANDLER_LINE);
-+      if (state->poll_needed)
-+      {
-+         state->poll_needed = 0;
-+
-+         /* Handle service polling and other rare conditions here out
-+            of the mainline code */
-+         switch (state->conn_state)
-+         {
-+         case VCHIQ_CONNSTATE_CONNECTED:
-+            /* Poll the services as requested */
-+            poll_services(state);
-+            break;
-+
-+         case VCHIQ_CONNSTATE_PAUSING:
-+            if (queue_message(state, NULL,
-+               VCHIQ_MAKE_MSG(VCHIQ_MSG_PAUSE, 0, 0), NULL, 0, 0, 0)
-+               != VCHIQ_RETRY)
-+            {
-+               if (state->is_master)
-+                  pause_bulks(state);
-+               vchiq_set_conn_state(state, VCHIQ_CONNSTATE_PAUSE_SENT);
-+            }
-+            else
-+            {
-+               state->poll_needed = 1; /* Retry later */
-+            }
-+            break;
-+
-+         case VCHIQ_CONNSTATE_RESUMING:
-+            if (queue_message(state, NULL,
-+               VCHIQ_MAKE_MSG(VCHIQ_MSG_RESUME, 0, 0), NULL, 0, 0, 0)
-+               != VCHIQ_RETRY)
-+            {
-+               if (state->is_master)
-+                  resume_bulks(state);
-+               vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED);
-+               vchiq_platform_resumed(state);
-+            }
-+            else
-+            {
-+               /* This should really be impossible, since the PAUSE should
-+                  have flushed through outstanding messages. */
-+               vcos_log_error("Failed to send RESUME message");
-+               vcos_demand(0);
-+            }
-+            break;
-+         default:
-+            break;
-+         }
-+      }
-+
-+      DEBUG_TRACE(SLOT_HANDLER_LINE);
-+      parse_rx_slots(state);
-+   }
-+   return NULL;
- }
- 
- 
- /* Called by the recycle thread */
--static int
-+static void *
- recycle_func(void *v)
- {
--	VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
--	VCHIQ_SHARED_STATE_T *local = state->local;
--
--	while (1) {
--		remote_event_wait(&local->recycle);
--
--		process_free_queue(state);
--	}
--	return 0;
--}
-+   VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
-+   VCHIQ_SHARED_STATE_T *local = state->local;
- 
-+   while (1) {
-+      remote_event_wait(&local->recycle);
- 
--/* Called by the sync thread */
--static int
--sync_func(void *v)
--{
--	VCHIQ_STATE_T *state = (VCHIQ_STATE_T *) v;
--	VCHIQ_SHARED_STATE_T *local = state->local;
--	VCHIQ_HEADER_T *header = (VCHIQ_HEADER_T *)SLOT_DATA_FROM_INDEX(state,
--		state->remote->slot_sync);
--
--	while (1) {
--		VCHIQ_SERVICE_T *service;
--		int msgid, size;
--		int type;
--		unsigned int localport, remoteport;
--
--		remote_event_wait(&local->sync_trigger);
--
--		rmb();
--
--		msgid = header->msgid;
--		size = header->size;
--		type = VCHIQ_MSG_TYPE(msgid);
--		localport = VCHIQ_MSG_DSTPORT(msgid);
--		remoteport = VCHIQ_MSG_SRCPORT(msgid);
--
--		service = find_service_by_port(state, localport);
--
--		if (!service) {
--			vchiq_log_error(vchiq_sync_log_level,
--				"%d: sf %s@%x (%d->%d) - "
--				"invalid/closed service %d",
--				state->id, msg_type_str(type),
--				(unsigned int)header,
--				remoteport, localport, localport);
--			release_message_sync(state, header);
--			continue;
--		}
--
--		if (vchiq_sync_log_level >= VCHIQ_LOG_TRACE) {
--			int svc_fourcc;
--
--			svc_fourcc = service
--				? service->base.fourcc
--				: VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
--			vchiq_log_trace(vchiq_sync_log_level,
--				"Rcvd Msg %s from %c%c%c%c s:%d d:%d len:%d",
--				msg_type_str(type),
--				VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
--				remoteport, localport, size);
--			if (size > 0)
--				vchiq_log_dump_mem("Rcvd", 0, header->data,
--					min(64, size));
--		}
--
--		switch (type) {
--		case VCHIQ_MSG_OPENACK:
--			vchiq_log_info(vchiq_sync_log_level,
--				"%d: sf OPENACK@%x (%d->%d)",
--				state->id, (unsigned int)header,
--				remoteport, localport);
--			if (service->srvstate == VCHIQ_SRVSTATE_OPENING) {
--				service->remoteport = remoteport;
--				vchiq_set_service_state(service,
--					VCHIQ_SRVSTATE_OPENSYNC);
--				up(&service->remove_event);
--			}
--			release_message_sync(state, header);
--			break;
--
--		case VCHIQ_MSG_DATA:
--			vchiq_log_trace(vchiq_sync_log_level,
--				"%d: sf DATA@%x,%x (%d->%d)",
--				state->id, (unsigned int)header, size,
--				remoteport, localport);
--
--			if ((service->remoteport == remoteport) &&
--				(service->srvstate ==
--				VCHIQ_SRVSTATE_OPENSYNC)) {
--				if (make_service_callback(service,
--					VCHIQ_MESSAGE_AVAILABLE, header,
--					NULL) == VCHIQ_RETRY)
--					vchiq_log_error(vchiq_sync_log_level,
--						"synchronous callback to "
--						"service %d returns "
--						"VCHIQ_RETRY",
--						localport);
--			}
--			break;
--
--		default:
--			vchiq_log_error(vchiq_sync_log_level,
--				"%d: sf unexpected msgid %x@%x,%x",
--				state->id, msgid, (unsigned int)header, size);
--			release_message_sync(state, header);
--			break;
--		}
-+      vcos_mutex_lock(&state->slot_mutex);
- 
--		unlock_service(service);
--	}
-+      process_free_queue(state);
- 
--	return 0;
-+      vcos_mutex_unlock(&state->slot_mutex);
-+   }
-+   return NULL;
- }
- 
- 
- static void
- init_bulk_queue(VCHIQ_BULK_QUEUE_T *queue)
- {
--	queue->local_insert = 0;
--	queue->remote_insert = 0;
--	queue->process = 0;
--	queue->remote_notify = 0;
--	queue->remove = 0;
-+   queue->local_insert = 0;
-+   queue->remote_insert = 0;
-+   queue->process = 0;
-+   queue->remote_notify = 0;
-+   queue->remove = 0;
- }
- 
--
--inline const char *
--get_conn_state_name(VCHIQ_CONNSTATE_T conn_state)
-+VCHIQ_SLOT_ZERO_T *
-+vchiq_init_slots(void *mem_base, int mem_size)
- {
--	return conn_state_names[conn_state];
--}
-+   int mem_align = (VCHIQ_SLOT_SIZE - (int)mem_base) & VCHIQ_SLOT_MASK;
-+   VCHIQ_SLOT_ZERO_T *slot_zero = (VCHIQ_SLOT_ZERO_T *)((char *)mem_base + mem_align);
-+   int num_slots = (mem_size - mem_align)/VCHIQ_SLOT_SIZE;
-+   int first_data_slot = VCHIQ_SLOT_ZERO_SLOTS;
-+
-+   /* Ensure there is enough memory to run an absolutely minimum system */
-+   num_slots -= first_data_slot;
-+
-+   if (num_slots < 4)
-+   {
-+      vcos_log_error("vchiq_init_slots - insufficient memory %x bytes", mem_size);
-+      return NULL;
-+   }
-+
-+   memset(slot_zero, 0, sizeof(VCHIQ_SLOT_ZERO_T));
-+
-+   slot_zero->magic = VCHIQ_MAGIC;
-+   slot_zero->version = VCHIQ_VERSION;
-+   slot_zero->version_min = VCHIQ_VERSION_MIN;
-+   slot_zero->slot_zero_size = sizeof(VCHIQ_SLOT_ZERO_T);
-+   slot_zero->slot_size = VCHIQ_SLOT_SIZE;
-+   slot_zero->max_slots = VCHIQ_MAX_SLOTS;
-+   slot_zero->max_slots_per_side = VCHIQ_MAX_SLOTS_PER_SIDE;
-+
-+   slot_zero->master.slot_first = first_data_slot;
-+   slot_zero->slave.slot_first = first_data_slot + (num_slots/2);
-+   slot_zero->master.slot_last = slot_zero->slave.slot_first - 1;
-+   slot_zero->slave.slot_last = first_data_slot + num_slots - 1;
- 
-+   return slot_zero;
-+}
- 
--VCHIQ_SLOT_ZERO_T *
--vchiq_init_slots(void *mem_base, int mem_size)
-+VCHIQ_STATUS_T
-+vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, int is_master)
- {
--	int mem_align = (VCHIQ_SLOT_SIZE - (int)mem_base) & VCHIQ_SLOT_MASK;
--	VCHIQ_SLOT_ZERO_T *slot_zero =
--		(VCHIQ_SLOT_ZERO_T *)((char *)mem_base + mem_align);
--	int num_slots = (mem_size - mem_align)/VCHIQ_SLOT_SIZE;
--	int first_data_slot = VCHIQ_SLOT_ZERO_SLOTS;
--
--	/* Ensure there is enough memory to run an absolutely minimum system */
--	num_slots -= first_data_slot;
--
--	if (num_slots < 4) {
--		vchiq_log_error(vchiq_core_log_level,
--			"vchiq_init_slots - insufficient memory %x bytes",
--			mem_size);
--		return NULL;
--	}
--
--	memset(slot_zero, 0, sizeof(VCHIQ_SLOT_ZERO_T));
--
--	slot_zero->magic = VCHIQ_MAGIC;
--	slot_zero->version = VCHIQ_VERSION;
--	slot_zero->version_min = VCHIQ_VERSION_MIN;
--	slot_zero->slot_zero_size = sizeof(VCHIQ_SLOT_ZERO_T);
--	slot_zero->slot_size = VCHIQ_SLOT_SIZE;
--	slot_zero->max_slots = VCHIQ_MAX_SLOTS;
--	slot_zero->max_slots_per_side = VCHIQ_MAX_SLOTS_PER_SIDE;
--
--	slot_zero->master.slot_sync = first_data_slot;
--	slot_zero->master.slot_first = first_data_slot + 1;
--	slot_zero->master.slot_last = first_data_slot + (num_slots/2) - 1;
--	slot_zero->slave.slot_sync = first_data_slot + (num_slots/2);
--	slot_zero->slave.slot_first = first_data_slot + (num_slots/2) + 1;
--	slot_zero->slave.slot_last = first_data_slot + num_slots - 1;
--
--	return slot_zero;
--}
--
--VCHIQ_STATUS_T
--vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
--		 int is_master)
--{
--	VCHIQ_SHARED_STATE_T *local;
--	VCHIQ_SHARED_STATE_T *remote;
--	VCHIQ_STATUS_T status;
--	char threadname[10];
--	static int id;
--	int i;
--
--	vchiq_log_warning(vchiq_core_log_level,
--		"%s: slot_zero = 0x%08lx, is_master = %d",
--		__func__, (unsigned long)slot_zero, is_master);
--
--	/* Check the input configuration */
--
--	if (slot_zero->magic != VCHIQ_MAGIC) {
--		vchiq_loud_error_header();
--		vchiq_loud_error("Invalid VCHIQ magic value found.");
--		vchiq_loud_error("slot_zero=%x: magic=%x (expected %x)",
--			(unsigned int)slot_zero, slot_zero->magic, VCHIQ_MAGIC);
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--
--	if (slot_zero->version < VCHIQ_VERSION_MIN) {
--		vchiq_loud_error_header();
--		vchiq_loud_error("Incompatible VCHIQ versions found.");
--		vchiq_loud_error("slot_zero=%x: VideoCore version=%d "
--			"(minimum %d)",
--			(unsigned int)slot_zero, slot_zero->version,
--			VCHIQ_VERSION_MIN);
--		vchiq_loud_error("Restart with a newer VideoCore image.");
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--
--	if (VCHIQ_VERSION < slot_zero->version_min) {
--		vchiq_loud_error_header();
--		vchiq_loud_error("Incompatible VCHIQ versions found.");
--		vchiq_loud_error("slot_zero=%x: version=%d (VideoCore "
--			"minimum %d)",
--			(unsigned int)slot_zero, VCHIQ_VERSION,
--			slot_zero->version_min);
--		vchiq_loud_error("Restart with a newer kernel.");
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--
--	if ((slot_zero->slot_zero_size != sizeof(VCHIQ_SLOT_ZERO_T)) ||
--		 (slot_zero->slot_size != VCHIQ_SLOT_SIZE) ||
--		 (slot_zero->max_slots != VCHIQ_MAX_SLOTS) ||
--		 (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)) {
--		vchiq_loud_error_header();
--		if (slot_zero->slot_zero_size != sizeof(VCHIQ_SLOT_ZERO_T))
--			vchiq_loud_error("slot_zero=%x: slot_zero_size=%x "
--				"(expected %x)",
--				(unsigned int)slot_zero,
--				slot_zero->slot_zero_size,
--				sizeof(VCHIQ_SLOT_ZERO_T));
--		if (slot_zero->slot_size != VCHIQ_SLOT_SIZE)
--			vchiq_loud_error("slot_zero=%x: slot_size=%d "
--				"(expected %d",
--				(unsigned int)slot_zero, slot_zero->slot_size,
--				VCHIQ_SLOT_SIZE);
--		if (slot_zero->max_slots != VCHIQ_MAX_SLOTS)
--			vchiq_loud_error("slot_zero=%x: max_slots=%d "
--				"(expected %d)",
--				(unsigned int)slot_zero, slot_zero->max_slots,
--				VCHIQ_MAX_SLOTS);
--		if (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)
--			vchiq_loud_error("slot_zero=%x: max_slots_per_side=%d "
--				"(expected %d)",
--				(unsigned int)slot_zero,
--				slot_zero->max_slots_per_side,
--				VCHIQ_MAX_SLOTS_PER_SIDE);
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--
--	if (is_master) {
--		local = &slot_zero->master;
--		remote = &slot_zero->slave;
--	} else {
--		local = &slot_zero->slave;
--		remote = &slot_zero->master;
--	}
--
--	if (local->initialised) {
--		vchiq_loud_error_header();
--		if (remote->initialised)
--			vchiq_loud_error("local state has already been "
--				"initialised");
--		else
--			vchiq_loud_error("master/slave mismatch - two %ss",
--				is_master ? "master" : "slave");
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--
--	memset(state, 0, sizeof(VCHIQ_STATE_T));
--
--	state->id = id++;
--	state->is_master = is_master;
--
--	/*
--		initialize shared state pointers
--	 */
--
--	state->local = local;
--	state->remote = remote;
--	state->slot_data = (VCHIQ_SLOT_T *)slot_zero;
--
--	/*
--		initialize events and mutexes
--	 */
--
--	sema_init(&state->connect, 0);
--	mutex_init(&state->mutex);
--	sema_init(&state->trigger_event, 0);
--	sema_init(&state->recycle_event, 0);
--	sema_init(&state->sync_trigger_event, 0);
--	sema_init(&state->sync_release_event, 0);
--
--	mutex_init(&state->slot_mutex);
--	mutex_init(&state->recycle_mutex);
--	mutex_init(&state->sync_mutex);
--	mutex_init(&state->bulk_transfer_mutex);
--
--	sema_init(&state->slot_available_event, 0);
--	sema_init(&state->slot_remove_event, 0);
--	sema_init(&state->data_quota_event, 0);
--
--	state->slot_queue_available = 0;
--
--	for (i = 0; i < VCHIQ_MAX_SERVICES; i++) {
--		VCHIQ_SERVICE_QUOTA_T *service_quota =
--			&state->service_quotas[i];
--		sema_init(&service_quota->quota_event, 0);
--	}
--
--	for (i = local->slot_first; i <= local->slot_last; i++) {
--		local->slot_queue[state->slot_queue_available++] = i;
--		up(&state->slot_available_event);
--	}
--
--	state->default_slot_quota = state->slot_queue_available/2;
--	state->default_message_quota =
--		min((unsigned short)(state->default_slot_quota * 256),
--		(unsigned short)~0);
--
--	state->previous_data_index = -1;
--	state->data_use_count = 0;
--	state->data_quota = state->slot_queue_available - 1;
--
--	local->trigger.event = &state->trigger_event;
--	remote_event_create(&local->trigger);
--	local->tx_pos = 0;
--
--	local->recycle.event = &state->recycle_event;
--	remote_event_create(&local->recycle);
--	local->slot_queue_recycle = state->slot_queue_available;
--
--	local->sync_trigger.event = &state->sync_trigger_event;
--	remote_event_create(&local->sync_trigger);
--
--	local->sync_release.event = &state->sync_release_event;
--	remote_event_create(&local->sync_release);
--
--	/* At start-of-day, the slot is empty and available */
--	((VCHIQ_HEADER_T *)SLOT_DATA_FROM_INDEX(state, local->slot_sync))->msgid
--		= VCHIQ_MSGID_PADDING;
--	remote_event_signal_local(&local->sync_release);
--
--	local->debug[DEBUG_ENTRIES] = DEBUG_MAX;
--
--	status = vchiq_platform_init_state(state);
--
--	/*
--		bring up slot handler thread
--	 */
--	snprintf(threadname, sizeof(threadname), "VCHIQ-%d", state->id);
--	state->slot_handler_thread = kthread_create(&slot_handler_func,
--		(void *)state,
--		threadname);
--
--	if (state->slot_handler_thread == NULL) {
--		vchiq_loud_error_header();
--		vchiq_loud_error("couldn't create thread %s", threadname);
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--	set_user_nice(state->slot_handler_thread, -19);
--	wake_up_process(state->slot_handler_thread);
--
--	snprintf(threadname, sizeof(threadname), "VCHIQr-%d", state->id);
--	state->recycle_thread = kthread_create(&recycle_func,
--		(void *)state,
--		threadname);
--	if (state->recycle_thread == NULL) {
--		vchiq_loud_error_header();
--		vchiq_loud_error("couldn't create thread %s", threadname);
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--	set_user_nice(state->recycle_thread, -19);
--	wake_up_process(state->recycle_thread);
--
--	snprintf(threadname, sizeof(threadname), "VCHIQs-%d", state->id);
--	state->sync_thread = kthread_create(&sync_func,
--		(void *)state,
--		threadname);
--	if (state->sync_thread == NULL) {
--		vchiq_loud_error_header();
--		vchiq_loud_error("couldn't create thread %s", threadname);
--		vchiq_loud_error_footer();
--		return VCHIQ_ERROR;
--	}
--	set_user_nice(state->sync_thread, -20);
--	wake_up_process(state->sync_thread);
-+   VCHIQ_SHARED_STATE_T *local;
-+   VCHIQ_SHARED_STATE_T *remote;
-+   VCOS_THREAD_ATTR_T attrs;
-+   VCHIQ_STATUS_T status;
-+   char threadname[10];
-+   static int id = 0;
-+   int i;
-+
-+   vcos_log_set_level(&vchiq_core_log_category, vchiq_default_core_log_level);
-+   vcos_log_set_level(&vchiq_core_msg_log_category, vchiq_default_core_msg_log_level);
-+   vcos_log_register("vchiq_core", &vchiq_core_log_category);
-+   vcos_log_register("vchiq_core_msg", &vchiq_core_msg_log_category);
-+
-+   vcos_log_warn( "%s: slot_zero = 0x%08lx, is_master = %d", __func__, (unsigned long)slot_zero, is_master );
-+
-+   /* Check the input configuration */
-+
-+   if (slot_zero->magic != VCHIQ_MAGIC)
-+   {
-+      vcos_log_error("slot_zero=%x: magic=%x (expected %x)",
-+         (unsigned int)slot_zero, slot_zero->magic, VCHIQ_MAGIC);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   if (slot_zero->version < VCHIQ_VERSION_MIN)
-+   {
-+      vcos_log_error("slot_zero=%x: peer_version=%x (minimum %x)",
-+         (unsigned int)slot_zero, slot_zero->version, VCHIQ_VERSION_MIN);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   if (VCHIQ_VERSION < slot_zero->version_min)
-+   {
-+      vcos_log_error("slot_zero=%x: version=%x (peer minimum %x)",
-+         (unsigned int)slot_zero, VCHIQ_VERSION, slot_zero->version_min);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   if (slot_zero->slot_zero_size != sizeof(VCHIQ_SLOT_ZERO_T))
-+   {
-+      vcos_log_error("slot_zero=%x: slot_zero_size=%x (expected %x)",
-+         (unsigned int)slot_zero, slot_zero->slot_zero_size, sizeof(VCHIQ_SLOT_ZERO_T));
-+      return VCHIQ_ERROR;
-+   }
-+
-+   if (slot_zero->slot_size != VCHIQ_SLOT_SIZE)
-+   {
-+      vcos_log_error("slot_zero=%x: slot_size=%d (expected %d",
-+         (unsigned int)slot_zero, slot_zero->slot_size, VCHIQ_SLOT_SIZE);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   if (slot_zero->max_slots != VCHIQ_MAX_SLOTS)
-+   {
-+      vcos_log_error("slot_zero=%x: max_slots=%d (expected %d)",
-+         (unsigned int)slot_zero, slot_zero->max_slots, VCHIQ_MAX_SLOTS);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   if (slot_zero->max_slots_per_side != VCHIQ_MAX_SLOTS_PER_SIDE)
-+   {
-+      vcos_log_error("slot_zero=%x: max_slots_per_side=%d (expected %d)",
-+         (unsigned int)slot_zero, slot_zero->max_slots_per_side,
-+         VCHIQ_MAX_SLOTS_PER_SIDE);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   if (is_master)
-+   {
-+      local = &slot_zero->master;
-+      remote = &slot_zero->slave;
-+   }
-+   else
-+   {
-+      local = &slot_zero->slave;
-+      remote = &slot_zero->master;
-+   }
-+
-+   if (local->initialised)
-+   {
-+      if (remote->initialised)
-+         vcos_log_error("vchiq: FATAL: local state has already been initialised");
-+      else
-+         vcos_log_error("vchiq: FATAL: master/slave mismatch - two %ss", is_master ? "master" : "slave");
-+      return VCHIQ_ERROR;
-+   }
-+
-+   memset(state, 0, sizeof(VCHIQ_STATE_T));
-+   vcos_log_warn( "%s: called", __func__);
-+   state->id = id++;
-+   state->is_master = is_master;
-+
-+   /*
-+      initialize shared state pointers
-+    */
-+
-+   state->local = local;
-+   state->remote = remote;
-+   state->slot_data = (VCHIQ_SLOT_T *)slot_zero;
-+
-+   /*
-+      initialize events and mutexes
-+    */
-+
-+   vcos_event_create(&state->connect, "v.connect");
-+   vcos_mutex_create(&state->mutex, "v.mutex");
-+   vcos_event_create(&state->trigger_event, "v.trigger_event");
-+   vcos_event_create(&state->recycle_event, "v.recycle_event");
-+
-+   vcos_mutex_create(&state->slot_mutex, "v.slot_mutex");
-+   vcos_mutex_create(&state->recycle_mutex, "v.recycle_mutex");
-+
-+   vcos_event_create(&state->slot_available_event, "v.slot_available_event");
-+   vcos_event_create(&state->slot_remove_event, "v.slot_remove_event");
-+
-+   state->slot_queue_available = 0;
-+
-+   for (i = 0; i < VCHIQ_MAX_SERVICES; i++)
-+   {
-+      VCHIQ_SERVICE_QUOTA_T *service_quota = &state->service_quotas[i];
-+      vcos_event_create(&service_quota->quota_event, "v.quota_event");
-+   }
-+
-+   for (i = local->slot_first; i <= local->slot_last; i++)
-+   {
-+      local->slot_queue[state->slot_queue_available++] = i;
-+   }
-+
-+   state->default_slot_quota = state->slot_queue_available/2;
-+   state->default_message_quota = vcos_min(state->default_slot_quota * 256, (unsigned short)~0);
-+
-+   local->trigger.event = &state->trigger_event;
-+   remote_event_create(&local->trigger);
-+   local->tx_pos = 0;
-+
-+   local->recycle.event = &state->recycle_event;
-+   remote_event_create(&local->recycle);
-+   local->slot_queue_recycle = state->slot_queue_available;
-+
-+   local->debug[DEBUG_ENTRIES] = DEBUG_MAX;
-+
-+   /*
-+      bring up slot handler thread
-+    */
-+
-+   vcos_thread_attr_init(&attrs);
-+   vcos_thread_attr_setstacksize(&attrs, VCHIQ_SLOT_HANDLER_STACK);
-+   vcos_thread_attr_setpriority(&attrs, VCOS_THREAD_PRI_REALTIME);
-+   vcos_snprintf(threadname, sizeof(threadname), "VCHIQ-%d", state->id);
-+   if (vcos_thread_create(&state->slot_handler_thread, threadname,
-+            &attrs, slot_handler_func, state) != VCOS_SUCCESS)
-+   {
-+      vcos_log_error("vchiq: FATAL: couldn't create thread %s", threadname);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   vcos_thread_attr_init(&attrs);
-+   vcos_thread_attr_setstacksize(&attrs, VCHIQ_SLOT_HANDLER_STACK);
-+   vcos_thread_attr_setpriority(&attrs, VCOS_THREAD_PRI_REALTIME);
-+   vcos_snprintf(threadname, sizeof(threadname), "VCHIQr-%d", state->id);
-+   if (vcos_thread_create(&state->recycle_thread, threadname,
-+            &attrs, recycle_func, state) != VCOS_SUCCESS)
-+   {
-+      vcos_log_error("vchiq: FATAL: couldn't create thread %s", threadname);
-+      return VCHIQ_ERROR;
-+   }
- 
--	BUG_ON(state->id >= VCHIQ_MAX_STATES);
--	vchiq_states[state->id] = state;
-+   status = vchiq_platform_init_state(state);
- 
--	/* Indicate readiness to the other side */
--	local->initialised = 1;
-+   /* Indicate readiness to the other side */
-+   local->initialised = 1;
- 
--	return status;
-+   return status;
- }
- 
- /* Called from application thread when a client or server service is created. */
- VCHIQ_SERVICE_T *
- vchiq_add_service_internal(VCHIQ_STATE_T *state,
--	const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,
--	VCHIQ_INSTANCE_T instance)
-+   const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,
-+   VCHIQ_INSTANCE_T instance)
- {
--	VCHIQ_SERVICE_T *service;
-+   VCHIQ_SERVICE_T **pservice = NULL;
-+   VCHIQ_SERVICE_T *service = NULL;
-+   int i;
-+
-+   /* Prepare to use a previously unused service */
-+   if (state->unused_service < VCHIQ_MAX_SERVICES)
-+   {
-+      pservice = &state->services[state->unused_service];
-+   }
-+
-+   if (srvstate == VCHIQ_SRVSTATE_OPENING) {
-+      for (i = 0; i < state->unused_service; i++) {
-+         VCHIQ_SERVICE_T *srv = state->services[i];
-+         if (!srv)
-+         {
-+            pservice = &state->services[i];
-+            break;
-+         }
-+         if (srv->srvstate == VCHIQ_SRVSTATE_FREE) {
-+            service = srv;
-+            break;
-+         }
-+      }
-+   } else {
-+      for (i = (state->unused_service - 1); i >= 0; i--) {
-+         VCHIQ_SERVICE_T *srv = state->services[i];
-+         if (!srv)
-+            pservice = &state->services[i];
-+         else if (srv->srvstate == VCHIQ_SRVSTATE_FREE) {
-+            service = srv;
-+         } else if ((srv->public_fourcc == params->fourcc) &&
-+            ((srv->instance != instance)
-+            || (srv->base.callback != params->callback))) {
-+            /* There is another server using this fourcc which doesn't match */
-+            pservice = NULL;
-+            service = NULL;
-+         }
-+      }
-+   }
-+
-+   if (pservice && !service)
-+   {
-+      service = vcos_malloc(sizeof(VCHIQ_SERVICE_T), "VCHIQ service");
-+      if (service)
-+      {
-+         service->srvstate = VCHIQ_SRVSTATE_FREE;
-+         service->localport = (pservice - state->services);
-+         vcos_event_create(&service->remove_event, "v.remove_event");
-+         vcos_event_create(&service->bulk_remove_event, "v.bulk_remove_event");
-+         vcos_mutex_create(&service->bulk_mutex, "v.bulk_mutex");
-+         *pservice = service;
-+      }
-+      else
-+      {
-+         vcos_log_error("vchiq: Out of memory");
-+      }
-+   }
-+
-+   if (service) {
-+      VCHIQ_SERVICE_QUOTA_T *service_quota =
-+         &state->service_quotas[service->localport];
-+      if (vcos_is_log_enabled( &vchiq_core_msg_log_category, VCOS_LOG_INFO)) {
-+         vcos_log_impl( &vchiq_core_msg_log_category,
-+                     VCOS_LOG_INFO,
-+                     "%s Service %c%c%c%c SrcPort:%d",
-+                     ( srvstate == VCHIQ_SRVSTATE_OPENING )
-+                     ? "Open" : "Add",
-+                     VCHIQ_FOURCC_AS_4CHARS(params->fourcc),
-+                     service->localport );
-+      }
-+      service->state = state;
-+      service->base.fourcc   = params->fourcc;
-+      service->base.callback = params->callback;
-+      service->base.userdata = params->userdata;
-+      service->version       = params->version;
-+      service->version_min   = params->version_min;
-+      vchiq_set_service_state(service, srvstate);
-+      service->public_fourcc =
-+         (srvstate ==
-+         VCHIQ_SRVSTATE_OPENING) ? VCHIQ_FOURCC_INVALID : params->fourcc;
-+      service->instance = instance;
-+      service->remoteport = VCHIQ_PORT_FREE;
-+      service->client_id = 0;
-+      service->auto_close = 1;
-+      service->service_use_count = 0;
-+      init_bulk_queue(&service->bulk_tx);
-+      init_bulk_queue(&service->bulk_rx);
-+      service_quota->slot_quota = state->default_slot_quota;
-+      service_quota->message_quota = state->default_message_quota;
-+      if (service_quota->slot_use_count == 0)
-+         service_quota->previous_tx_index =
-+            SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos) - 1;
-+      memset(&service->stats, 0, sizeof(service->stats));
-+      vcos_atomic_flags_create(&service->poll_flags);
-+
-+      /* Ensure the events are unsignalled */
-+      while (vcos_event_try(&service->remove_event) == VCOS_SUCCESS)
-+         continue;
-+      while (vcos_event_try(&service_quota->quota_event) == VCOS_SUCCESS)
-+         continue;
-+
-+      if (pservice == &state->services[state->unused_service])
-+         state->unused_service++;
-+   }
- 
--	service = kmalloc(sizeof(VCHIQ_SERVICE_T), GFP_KERNEL);
--	if (service) {
--		service->base.fourcc   = params->fourcc;
--		service->base.callback = params->callback;
--		service->base.userdata = params->userdata;
--		service->handle        = VCHIQ_SERVICE_HANDLE_INVALID;
--		service->ref_count     = 1;
--		service->srvstate      = VCHIQ_SRVSTATE_FREE;
--		service->localport     = VCHIQ_PORT_FREE;
--		service->remoteport    = VCHIQ_PORT_FREE;
--
--		service->public_fourcc = (srvstate == VCHIQ_SRVSTATE_OPENING) ?
--			VCHIQ_FOURCC_INVALID : params->fourcc;
--		service->client_id     = 0;
--		service->auto_close    = 1;
--		service->sync          = 0;
--		service->closing       = 0;
--		atomic_set(&service->poll_flags, 0);
--		service->version       = params->version;
--		service->version_min   = params->version_min;
--		service->state         = state;
--		service->instance      = instance;
--		service->service_use_count = 0;
--		init_bulk_queue(&service->bulk_tx);
--		init_bulk_queue(&service->bulk_rx);
--		sema_init(&service->remove_event, 0);
--		sema_init(&service->bulk_remove_event, 0);
--		mutex_init(&service->bulk_mutex);
--		memset(&service->stats, 0, sizeof(service->stats));
--	} else {
--		vchiq_log_error(vchiq_core_log_level,
--			"Out of memory");
--	}
--
--	if (service) {
--		VCHIQ_SERVICE_T **pservice = NULL;
--		int i;
--
--		/* Although it is perfectly possible to use service_spinlock
--		** to protect the creation of services, it is overkill as it
--		** disables interrupts while the array is searched.
--		** The only danger is of another thread trying to create a
--		** service - service deletion is safe.
--		** Therefore it is preferable to use state->mutex which,
--		** although slower to claim, doesn't block interrupts while
--		** it is held.
--		*/
--
--		mutex_lock(&state->mutex);
--
--		/* Prepare to use a previously unused service */
--		if (state->unused_service < VCHIQ_MAX_SERVICES)
--			pservice = &state->services[state->unused_service];
--
--		if (srvstate == VCHIQ_SRVSTATE_OPENING) {
--			for (i = 0; i < state->unused_service; i++) {
--				VCHIQ_SERVICE_T *srv = state->services[i];
--				if (!srv) {
--					pservice = &state->services[i];
--					break;
--				}
--			}
--		} else {
--			for (i = (state->unused_service - 1); i >= 0; i--) {
--				VCHIQ_SERVICE_T *srv = state->services[i];
--				if (!srv)
--					pservice = &state->services[i];
--				else if ((srv->public_fourcc == params->fourcc)
--					&& ((srv->instance != instance) ||
--					(srv->base.callback !=
--					params->callback))) {
--					/* There is another server using this
--					** fourcc which doesn't match. */
--					pservice = NULL;
--					break;
--				}
--			}
--		}
--
--		if (pservice) {
--			service->localport = (pservice - state->services);
--			if (!handle_seq)
--				handle_seq = VCHIQ_MAX_STATES *
--					 VCHIQ_MAX_SERVICES;
--			service->handle = handle_seq |
--				(state->id * VCHIQ_MAX_SERVICES) |
--				service->localport;
--			handle_seq += VCHIQ_MAX_STATES * VCHIQ_MAX_SERVICES;
--			*pservice = service;
--			if (pservice == &state->services[state->unused_service])
--				state->unused_service++;
--		}
--
--		mutex_unlock(&state->mutex);
--
--		if (!pservice) {
--			kfree(service);
--			service = NULL;
--		}
--	}
--
--	if (service) {
--		VCHIQ_SERVICE_QUOTA_T *service_quota =
--			&state->service_quotas[service->localport];
--		service_quota->slot_quota = state->default_slot_quota;
--		service_quota->message_quota = state->default_message_quota;
--		if (service_quota->slot_use_count == 0)
--			service_quota->previous_tx_index =
--				SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos)
--				- 1;
--
--		/* Bring this service online */
--		vchiq_set_service_state(service, srvstate);
--
--		vchiq_log_info(vchiq_core_msg_log_level,
--			"%s Service %c%c%c%c SrcPort:%d",
--			(srvstate == VCHIQ_SRVSTATE_OPENING)
--			? "Open" : "Add",
--			VCHIQ_FOURCC_AS_4CHARS(params->fourcc),
--			service->localport);
--	}
--
--	/* Don't unlock the service - leave it with a ref_count of 1. */
--
--	return service;
-+   return service;
- }
- 
- VCHIQ_STATUS_T
- vchiq_open_service_internal(VCHIQ_SERVICE_T *service, int client_id)
- {
--	struct vchiq_open_payload payload = {
--		service->base.fourcc,
--		client_id,
--		service->version,
--		service->version_min
--	};
--	VCHIQ_ELEMENT_T body = { &payload, sizeof(payload) };
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
--
--	service->client_id = client_id;
--	vchiq_use_service_internal(service);
--	status = queue_message(service->state, NULL,
--		VCHIQ_MAKE_MSG(VCHIQ_MSG_OPEN, service->localport, 0),
--		&body, 1, sizeof(payload), 1);
--	if (status == VCHIQ_SUCCESS) {
--		if (down_interruptible(&service->remove_event) != 0) {
--			status = VCHIQ_RETRY;
--			vchiq_release_service_internal(service);
--		} else if ((service->srvstate != VCHIQ_SRVSTATE_OPEN) &&
--			(service->srvstate != VCHIQ_SRVSTATE_OPENSYNC)) {
--			if (service->srvstate != VCHIQ_SRVSTATE_CLOSEWAIT)
--				vchiq_log_error(vchiq_core_log_level,
--					"%d: osi - srvstate = %s (ref %d)",
--					service->state->id,
--					srvstate_names[service->srvstate],
--					service->ref_count);
--			status = VCHIQ_ERROR;
--			VCHIQ_SERVICE_STATS_INC(service, error_count);
--			vchiq_release_service_internal(service);
--		}
--	}
--	return status;
--}
--
--static void
--release_service_messages(VCHIQ_SERVICE_T *service)
--{
--	VCHIQ_STATE_T *state = service->state;
--	int slot_last = state->remote->slot_last;
--	int i;
--
--	/* Release any claimed messages */
--	for (i = state->remote->slot_first; i <= slot_last; i++) {
--		VCHIQ_SLOT_INFO_T *slot_info =
--			SLOT_INFO_FROM_INDEX(state, i);
--		if (slot_info->release_count != slot_info->use_count) {
--			char *data =
--				(char *)SLOT_DATA_FROM_INDEX(state, i);
--			unsigned int pos, end;
--
--			end = VCHIQ_SLOT_SIZE;
--			if (data == state->rx_data)
--				/* This buffer is still being read from - stop
--				** at the current read position */
--				end = state->rx_pos & VCHIQ_SLOT_MASK;
--
--			pos = 0;
--
--			while (pos < end) {
--				VCHIQ_HEADER_T *header =
--					(VCHIQ_HEADER_T *)(data + pos);
--				int msgid = header->msgid;
--				int port = VCHIQ_MSG_DSTPORT(msgid);
--				if ((port == service->localport) &&
--					(msgid & VCHIQ_MSGID_CLAIMED)) {
--					vchiq_log_info(vchiq_core_log_level,
--						"  fsi - hdr %x",
--						(unsigned int)header);
--					release_slot(state, slot_info, header,
--						NULL);
--				}
--				pos += calc_stride(header->size);
--				if (pos > VCHIQ_SLOT_SIZE) {
--					vchiq_log_error(vchiq_core_log_level,
--						"fsi - pos %x: header %x, "
--						"msgid %x, header->msgid %x, "
--						"header->size %x",
--						pos, (unsigned int)header,
--						msgid, header->msgid,
--						header->size);
--					WARN(1, "invalid slot position\n");
--				}
--			}
--		}
--	}
--}
--
--static int
--do_abort_bulks(VCHIQ_SERVICE_T *service)
--{
--	VCHIQ_STATUS_T status;
--
--	/* Abort any outstanding bulk transfers */
--	if (mutex_lock_interruptible(&service->bulk_mutex) != 0)
--		return 0;
--	abort_outstanding_bulks(service, &service->bulk_tx);
--	abort_outstanding_bulks(service, &service->bulk_rx);
--	mutex_unlock(&service->bulk_mutex);
--
--	status = notify_bulks(service, &service->bulk_tx, 0/*!retry_poll*/);
--	if (status == VCHIQ_SUCCESS)
--		status = notify_bulks(service, &service->bulk_rx,
--			0/*!retry_poll*/);
--	return (status == VCHIQ_SUCCESS);
--}
--
--static VCHIQ_STATUS_T
--close_service_complete(VCHIQ_SERVICE_T *service, int failstate)
--{
--	VCHIQ_STATUS_T status;
--	int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID);
--	int newstate;
--
--	switch (service->srvstate) {
--	case VCHIQ_SRVSTATE_OPEN:
--	case VCHIQ_SRVSTATE_CLOSESENT:
--	case VCHIQ_SRVSTATE_CLOSERECVD:
--		if (is_server)
--			newstate = (service->auto_close ?
--				VCHIQ_SRVSTATE_LISTENING :
--				VCHIQ_SRVSTATE_CLOSEWAIT);
--		else
--			newstate = VCHIQ_SRVSTATE_CLOSED;
--		vchiq_set_service_state(service, newstate);
--		break;
--	default:
--		break;
--	}
--
--	status = make_service_callback(service,
--		VCHIQ_SERVICE_CLOSED, NULL, NULL);
--
--	if (status != VCHIQ_RETRY) {
--		int uc = service->service_use_count;
--		int i;
--		/* Complete the close process */
--		for (i = 0; i < uc; i++)
--			/* cater for cases where close is forced and the
--			** client may not close all it's handles */
--			vchiq_release_service_internal(service);
--
--		service->client_id = 0;
--		if (status == VCHIQ_ERROR)
--			/* Signal an error (fatal, since the other end
--			** will probably have closed) */
--			vchiq_set_service_state(service, VCHIQ_SRVSTATE_OPEN);
--
--		if (service->srvstate == VCHIQ_SRVSTATE_CLOSED)
--			vchiq_free_service_internal(service);
--		else {
--			if (is_server)
--				service->closing = 0;
--
--			up(&service->remove_event);
--		}
--	} else
--		vchiq_set_service_state(service, failstate);
--
--	return status;
-+   VCHIQ_OPEN_PAYLOAD_T payload = {
-+      service->base.fourcc,
-+      client_id,
-+      service->version,
-+      service->version_min
-+   };
-+   VCHIQ_ELEMENT_T body = { &payload, sizeof(payload) };
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+
-+   service->client_id = client_id;
-+   vchiq_use_service(&service->base);
-+   status = queue_message(service->state, NULL,
-+                     VCHIQ_MAKE_MSG(VCHIQ_MSG_OPEN, service->localport, 0),
-+                     &body, 1, sizeof(payload), 1);
-+   if (status == VCHIQ_SUCCESS) {
-+      if (vcos_event_wait(&service->remove_event) != VCOS_SUCCESS) {
-+         status = VCHIQ_RETRY;
-+         vchiq_release_service(&service->base);
-+      } else if (service->srvstate != VCHIQ_SRVSTATE_OPEN) {
-+         vcos_log_info("%d: osi - srvstate = %d", service->state->id, service->srvstate);
-+         vcos_assert(service->srvstate == VCHIQ_SRVSTATE_CLOSEWAIT);
-+         status = VCHIQ_ERROR;
-+         VCHIQ_SERVICE_STATS_INC(service, error_count);
-+         vchiq_release_service(&service->base);
-+      }
-+   }
-+   return status;
- }
- 
- /* Called by the slot handler */
- VCHIQ_STATUS_T
- vchiq_close_service_internal(VCHIQ_SERVICE_T *service, int close_recvd)
- {
--	VCHIQ_STATE_T *state = service->state;
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   VCHIQ_STATE_T *state = service->state;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
- 
--	vchiq_log_info(vchiq_core_log_level, "%d: csi:%d,%d (%s)",
--		service->state->id, service->localport, close_recvd,
--		srvstate_names[service->srvstate]);
--
--	switch (service->srvstate) {
--	case VCHIQ_SRVSTATE_CLOSED:
--	case VCHIQ_SRVSTATE_HIDDEN:
--	case VCHIQ_SRVSTATE_LISTENING:
--	case VCHIQ_SRVSTATE_CLOSEWAIT:
--		if (close_recvd)
--			vchiq_log_error(vchiq_core_log_level,
--				"vchiq_close_service_internal(1) called "
--				"in state %s",
--				srvstate_names[service->srvstate]);
--		else
--			vchiq_free_service_internal(service);
--		break;
--	case VCHIQ_SRVSTATE_OPENING:
--		if (close_recvd) {
--			/* The open was rejected - tell the user */
--			vchiq_set_service_state(service,
--				VCHIQ_SRVSTATE_CLOSEWAIT);
--			up(&service->remove_event);
--		} else {
--			/* Shutdown mid-open - let the other side know */
--			status = queue_message(state, service,
--				VCHIQ_MAKE_MSG
--				(VCHIQ_MSG_CLOSE,
--				service->localport,
--				VCHIQ_MSG_DSTPORT(service->remoteport)),
--				NULL, 0, 0, 0);
--		}
--		break;
--
--	case VCHIQ_SRVSTATE_OPENSYNC:
--		mutex_lock(&state->sync_mutex);
--		/* Drop through */
--
--	case VCHIQ_SRVSTATE_OPEN:
--		if (state->is_master || close_recvd) {
--			if (!do_abort_bulks(service))
--				status = VCHIQ_RETRY;
--		}
--
--		release_service_messages(service);
--
--		if (status == VCHIQ_SUCCESS)
--			status = queue_message(state, service,
--				VCHIQ_MAKE_MSG
--				(VCHIQ_MSG_CLOSE,
--				service->localport,
--				VCHIQ_MSG_DSTPORT(service->remoteport)),
--				NULL, 0, 0, 0);
--
--		if (status == VCHIQ_SUCCESS) {
--			if (!close_recvd)
--				break;
--		} else if (service->srvstate == VCHIQ_SRVSTATE_OPENSYNC) {
--			mutex_unlock(&state->sync_mutex);
--			break;
--		} else
--			break;
--
--		status = close_service_complete(service,
--				VCHIQ_SRVSTATE_CLOSERECVD);
--		break;
--
--	case VCHIQ_SRVSTATE_CLOSESENT:
--		if (!close_recvd)
--			/* This happens when a process is killed mid-close */
--			break;
--
--		if (!state->is_master) {
--			if (!do_abort_bulks(service)) {
--				status = VCHIQ_RETRY;
--				break;
--			}
--		}
--
--		if (status == VCHIQ_SUCCESS)
--			status = close_service_complete(service,
--				VCHIQ_SRVSTATE_CLOSERECVD);
--		break;
--
--	case VCHIQ_SRVSTATE_CLOSERECVD:
--		if (!close_recvd &&
--			(service->public_fourcc != VCHIQ_FOURCC_INVALID))
--			/* Force into LISTENING mode */
--			vchiq_set_service_state(service,
--				VCHIQ_SRVSTATE_LISTENING);
--		status = close_service_complete(service,
--			VCHIQ_SRVSTATE_CLOSERECVD);
--		break;
--
--	default:
--		vchiq_log_error(vchiq_core_log_level,
--			"vchiq_close_service_internal(%d) called in state %s",
--			close_recvd, srvstate_names[service->srvstate]);
--		break;
--	}
-+   vcos_log_trace("%d: csi:%d (%s)",
-+      service->state->id, service->localport,
-+      srvstate_names[service->srvstate]);
-+
-+   switch (service->srvstate)
-+   {
-+   case VCHIQ_SRVSTATE_OPENING:
-+      if (close_recvd)
-+      {
-+         /* The open was rejected - tell the user */
-+         vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSEWAIT);
-+         vcos_event_signal(&service->remove_event);
-+      }
-+      else
-+      {
-+         /* Shutdown mid-open - let the other side know */
-+         status = queue_message(state, NULL,
-+            VCHIQ_MAKE_MSG
-+            (VCHIQ_MSG_CLOSE,
-+            service->localport,
-+            VCHIQ_MSG_DSTPORT(service->remoteport)),
-+            NULL, 0, 0, 0);
-+
-+         if (status == VCHIQ_SUCCESS)
-+            vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSESENT);
-+      }
-+      break;
-+
-+   case VCHIQ_SRVSTATE_OPEN:
-+      if (state->is_master)
-+      {
-+         /* Abort any outstanding bulk transfers */
-+         vcos_mutex_lock(&service->bulk_mutex);
-+         abort_outstanding_bulks(service, &service->bulk_tx);
-+         abort_outstanding_bulks(service, &service->bulk_rx);
-+         status = notify_bulks(service, &service->bulk_tx);
-+         if (status == VCHIQ_SUCCESS)
-+            status = notify_bulks(service, &service->bulk_rx);
-+         vcos_mutex_unlock(&service->bulk_mutex);
-+      }
-+
-+      if (status == VCHIQ_SUCCESS)
-+         status = queue_message(state, NULL,
-+            VCHIQ_MAKE_MSG
-+            (VCHIQ_MSG_CLOSE,
-+            service->localport,
-+            VCHIQ_MSG_DSTPORT(service->remoteport)),
-+            NULL, 0, 0, 0);
-+
-+      if (status == VCHIQ_SUCCESS)
-+      {
-+         if (close_recvd)
-+            vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSING);
-+         else
-+            vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSESENT);
-+      }
-+      break;
-+
-+   case VCHIQ_SRVSTATE_CLOSESENT:
-+      vcos_assert(close_recvd);
-+
-+      if (!state->is_master)
-+      {
-+         /* Abort any outstanding bulk transfers */
-+         vcos_mutex_lock(&service->bulk_mutex);
-+         abort_outstanding_bulks(service, &service->bulk_tx);
-+         abort_outstanding_bulks(service, &service->bulk_rx);
-+         status = notify_bulks(service, &service->bulk_tx);
-+         if (status == VCHIQ_SUCCESS)
-+            status = notify_bulks(service, &service->bulk_rx);
-+         vcos_mutex_unlock(&service->bulk_mutex);
-+      }
-+
-+      if (status == VCHIQ_SUCCESS)
-+         vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSING);
-+      break;
-+
-+   case VCHIQ_SRVSTATE_CLOSING:
-+      /* We may come here after a retry */
-+      vcos_assert(!close_recvd);
-+      break;
-+
-+   default:
-+      vcos_log_error("vchiq_close_service_internal(%d) called in state %s",
-+         close_recvd, srvstate_names[service->srvstate]);
-+      vcos_assert(0);
-+      break;
-+   }
-+
-+   if (service->srvstate == VCHIQ_SRVSTATE_CLOSING)
-+   {
-+      int i;
-+      int uc = service->service_use_count;
-+      /* Complete the close process */
-+      for( i=0; i<uc; i++)
-+      { /* cater for cases where close is forced and the client may not close all it's handles */
-+         vchiq_release_service_internal(service);
-+      }
-+      service->client_id = 0;
-+
-+      /* Now tell the client that the services is closed */
-+      if (service->instance)
-+      {
-+         int oldstate = service->srvstate;
-+
-+         /* Change the service state now for the benefit of the callback */
-+         vchiq_set_service_state(service,
-+            ((service->public_fourcc == VCHIQ_FOURCC_INVALID) ||
-+            !service->auto_close) ?
-+            VCHIQ_SRVSTATE_CLOSEWAIT :
-+            VCHIQ_SRVSTATE_LISTENING);
-+
-+         status = make_service_callback(service, VCHIQ_SERVICE_CLOSED, NULL, NULL);
-+
-+         if (status == VCHIQ_RETRY)
-+         {
-+            /* Restore the old state, to be retried later */
-+            vchiq_set_service_state(service, oldstate);
-+         }
-+         else
-+         {
-+            if (status == VCHIQ_ERROR) {
-+               /* Signal an error (fatal, since the other end will probably have closed) */
-+               vchiq_set_service_state(service, VCHIQ_SRVSTATE_OPEN);
-+            }
-+         }
-+      }
-+
-+      if (status != VCHIQ_RETRY)
-+      {
-+         if (service->srvstate == VCHIQ_SRVSTATE_CLOSING)
-+            vchiq_set_service_state(service, VCHIQ_SRVSTATE_CLOSEWAIT);
-+         vcos_event_signal(&service->remove_event);
-+      }
-+   }
- 
--	return status;
-+   return status;
- }
- 
- /* Called from the application process upon process death */
- void
- vchiq_terminate_service_internal(VCHIQ_SERVICE_T *service)
- {
--	VCHIQ_STATE_T *state = service->state;
--
--	vchiq_log_info(vchiq_core_log_level, "%d: tsi - (%d<->%d)",
--		state->id, service->localport, service->remoteport);
-+   VCHIQ_STATE_T *state = service->state;
- 
--	/* Make it look like a client, because it must be removed and not
--	   left in the LISTENING state. */
--	service->public_fourcc = VCHIQ_FOURCC_INVALID;
-+   vcos_log_info("%d: tsi - (%d<->%d)", state->id, service->localport, service->remoteport);
- 
--	mark_service_closing(service);
-+   /* Disconnect from the instance, to prevent any callbacks */
-+   service->instance = NULL;
- 
--	/* Mark the service for termination by the slot handler */
--	request_poll(state, service, VCHIQ_POLL_TERMINATE);
-+   /* Mark the service for termination by the slot handler */
-+   request_poll(state, service, VCHIQ_POLL_TERMINATE);
- }
- 
--/* Called from the slot handler */
-+/* Called from the application process upon process death, and from
-+   vchiq_remove_service */
- void
- vchiq_free_service_internal(VCHIQ_SERVICE_T *service)
- {
--	VCHIQ_STATE_T *state = service->state;
--
--	vchiq_log_info(vchiq_core_log_level, "%d: fsi - (%d)",
--		state->id, service->localport);
--
--	switch (service->srvstate) {
--	case VCHIQ_SRVSTATE_OPENING:
--	case VCHIQ_SRVSTATE_CLOSED:
--	case VCHIQ_SRVSTATE_HIDDEN:
--	case VCHIQ_SRVSTATE_LISTENING:
--	case VCHIQ_SRVSTATE_CLOSEWAIT:
--		break;
--	default:
--		vchiq_log_error(vchiq_core_log_level,
--			"%d: fsi - (%d) in state %s",
--			state->id, service->localport,
--			srvstate_names[service->srvstate]);
--		return;
--	}
--
--	vchiq_set_service_state(service, VCHIQ_SRVSTATE_FREE);
--
--	up(&service->remove_event);
--
--	/* Release the initial lock */
--	unlock_service(service);
-+   VCHIQ_STATE_T *state = service->state;
-+   int slot_last = state->remote->slot_last;
-+   int i;
-+
-+   vcos_log_info("%d: fsi - (%d)", state->id, service->localport);
-+
-+   vcos_mutex_lock(&state->mutex);
-+
-+   /* Release any claimed messages */
-+   for (i = state->remote->slot_first; i <= slot_last; i++)
-+   {
-+      VCHIQ_SLOT_INFO_T *slot_info = SLOT_INFO_FROM_INDEX(state, i);
-+      if (slot_info->release_count != slot_info->use_count)
-+      {
-+         char *data = (char *)SLOT_DATA_FROM_INDEX(state, i);
-+         unsigned int pos, end;
-+
-+         end = VCHIQ_SLOT_SIZE;
-+         if (data == state->rx_data)
-+         {
-+            /* This buffer is still being read from - stop at the current read position */
-+            end = state->rx_pos & VCHIQ_SLOT_MASK;
-+         }
-+
-+         pos = 0;
-+
-+         while (pos < end)
-+         {
-+            VCHIQ_HEADER_T *header = (VCHIQ_HEADER_T *)(data + pos);
-+            int msgid = header->msgid;
-+            int port = VCHIQ_MSG_DSTPORT(msgid);
-+            if (port == service->localport)
-+            {
-+               if (msgid & VCHIQ_MSGID_CLAIMED)
-+               {
-+                  header->msgid = msgid & ~VCHIQ_MSGID_CLAIMED;
-+                  vcos_log_info("  fsi - hdr %x", (unsigned int)header);
-+                  release_slot(state, slot_info);
-+               }
-+            }
-+            pos += calc_stride(header->size);
-+            if (pos > VCHIQ_SLOT_SIZE)
-+            {
-+               vcos_log_error("fsi - pos %x: header %x, msgid %x, header->msgid %x, header->size %x",
-+                  pos, (unsigned int)header, msgid, header->msgid, header->size);
-+               vcos_assert(0);
-+            }
-+         }
-+      }
-+   }
-+
-+   vcos_assert(state->services[service->localport] == service);
-+   vchiq_set_service_state(service, VCHIQ_SRVSTATE_FREE);
-+   state->services[service->localport] = NULL;
-+   vcos_free(service);
-+   vcos_mutex_unlock(&state->mutex);
- }
- 
- VCHIQ_STATUS_T
- vchiq_connect_internal(VCHIQ_STATE_T *state, VCHIQ_INSTANCE_T instance)
- {
--	VCHIQ_SERVICE_T *service;
--	int i;
-+   int i;
-+
-+   /* Find all services registered to this client and enable them. */
-+   for (i = 0; i < state->unused_service; i++)
-+   {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      if (service && (service->instance == instance)) {
-+         if (service->srvstate == VCHIQ_SRVSTATE_HIDDEN)
-+            vchiq_set_service_state(service,
-+               VCHIQ_SRVSTATE_LISTENING);
-+      }
-+   }
-+
-+   if (state->conn_state == VCHIQ_CONNSTATE_DISCONNECTED) {
-+      if (queue_message(state, NULL,
-+         VCHIQ_MAKE_MSG(VCHIQ_MSG_CONNECT, 0, 0), NULL, 0,
-+         0, 1) == VCHIQ_RETRY)
-+         return VCHIQ_RETRY;
-+      vcos_event_wait(&state->connect);
- 
--	/* Find all services registered to this client and enable them. */
--	i = 0;
--	while ((service = next_service_by_instance(state, instance,
--		&i)) !=	NULL) {
--		if (service->srvstate == VCHIQ_SRVSTATE_HIDDEN)
--			vchiq_set_service_state(service,
--				VCHIQ_SRVSTATE_LISTENING);
--		unlock_service(service);
--	}
--
--	if (state->conn_state == VCHIQ_CONNSTATE_DISCONNECTED) {
--		if (queue_message(state, NULL,
--			VCHIQ_MAKE_MSG(VCHIQ_MSG_CONNECT, 0, 0), NULL, 0,
--			0, 1) == VCHIQ_RETRY)
--			return VCHIQ_RETRY;
--
--		vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTING);
--	}
--
--	if (state->conn_state == VCHIQ_CONNSTATE_CONNECTING) {
--		if (down_interruptible(&state->connect) != 0)
--			return VCHIQ_RETRY;
--
--		vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED);
--		up(&state->connect);
--	}
-+      vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED);
-+   }
- 
--	return VCHIQ_SUCCESS;
-+   return VCHIQ_SUCCESS;
- }
- 
- VCHIQ_STATUS_T
- vchiq_shutdown_internal(VCHIQ_STATE_T *state, VCHIQ_INSTANCE_T instance)
- {
--	VCHIQ_SERVICE_T *service;
--	int i;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   int i;
- 
--	/* Find all services registered to this client and enable them. */
--	i = 0;
--	while ((service = next_service_by_instance(state, instance,
--		&i)) !=	NULL) {
--		(void)vchiq_remove_service(service->handle);
--		unlock_service(service);
--	}
-+   /* Find all services registered to this client and close them. */
-+   for (i = 0; i < state->unused_service; i++)
-+   {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+      if (service && (service->instance == instance) &&
-+         ((service->srvstate == VCHIQ_SRVSTATE_OPEN) ||
-+         (service->srvstate == VCHIQ_SRVSTATE_LISTENING)))
-+      {
-+         status = vchiq_remove_service(&service->base);
-+         if (status != VCHIQ_SUCCESS)
-+            break;
-+      }
-+   }
- 
--	return VCHIQ_SUCCESS;
-+   return status;
- }
- 
- VCHIQ_STATUS_T
- vchiq_pause_internal(VCHIQ_STATE_T *state)
- {
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
- 
--	switch (state->conn_state) {
--	case VCHIQ_CONNSTATE_CONNECTED:
--		/* Request a pause */
--		vchiq_set_conn_state(state, VCHIQ_CONNSTATE_PAUSING);
--		request_poll(state, NULL, 0);
--		break;
--	default:
--		vchiq_log_error(vchiq_core_log_level,
--			"vchiq_pause_internal in state %s\n",
--			conn_state_names[state->conn_state]);
--		status = VCHIQ_ERROR;
--		VCHIQ_STATS_INC(state, error_count);
--		break;
--	}
-+   switch (state->conn_state)
-+   {
-+   case VCHIQ_CONNSTATE_CONNECTED:
-+      /* Request a pause */
-+      vchiq_set_conn_state(state, VCHIQ_CONNSTATE_PAUSING);
-+      request_poll(state, NULL, 0);
-+      break;
-+   case VCHIQ_CONNSTATE_PAUSED:
-+      break;
-+   default:
-+      status = VCHIQ_ERROR;
-+      VCHIQ_STATS_INC(state, error_count);
-+      break;
-+   }
- 
--	return status;
-+   return status;
- }
- 
- VCHIQ_STATUS_T
- vchiq_resume_internal(VCHIQ_STATE_T *state)
- {
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
- 
--	if (state->conn_state == VCHIQ_CONNSTATE_PAUSED) {
--		vchiq_set_conn_state(state, VCHIQ_CONNSTATE_RESUMING);
--		request_poll(state, NULL, 0);
--	} else {
--		status = VCHIQ_ERROR;
--		VCHIQ_STATS_INC(state, error_count);
--	}
-+   if (state->conn_state == VCHIQ_CONNSTATE_PAUSED)
-+   {
-+      vchiq_set_conn_state(state, VCHIQ_CONNSTATE_RESUMING);
-+      request_poll(state, NULL, 0);
-+   }
-+   else
-+   {
-+      status = VCHIQ_ERROR;
-+      VCHIQ_STATS_INC(state, error_count);
-+   }
- 
--	return status;
-+   return status;
- }
- 
- VCHIQ_STATUS_T
- vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
- {
--	/* Unregister the service */
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	VCHIQ_STATUS_T status = VCHIQ_ERROR;
--
--	if (!service)
--		return VCHIQ_ERROR;
--
--	vchiq_log_info(vchiq_core_log_level,
--		"%d: close_service:%d",
--		service->state->id, service->localport);
--
--	mark_service_closing(service);
--
--	/* Mark the service for termination by the slot handler */
--	request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
--
--	while (1) {
--		if (down_interruptible(&service->remove_event) != 0) {
--			status = VCHIQ_RETRY;
--			break;
--		}
--
--		if ((service->srvstate == VCHIQ_SRVSTATE_FREE) ||
--			(service->srvstate == VCHIQ_SRVSTATE_LISTENING) ||
--			(service->srvstate == VCHIQ_SRVSTATE_OPEN))
--			break;
--
--		vchiq_log_warning(vchiq_core_log_level,
--			"%d: close_service:%d - waiting in state %s",
--			service->state->id, service->localport,
--			srvstate_names[service->srvstate]);
--	}
--
--	if ((status == VCHIQ_SUCCESS) &&
--		(service->srvstate != VCHIQ_SRVSTATE_FREE) &&
--		(service->srvstate != VCHIQ_SRVSTATE_LISTENING))
--		status = VCHIQ_ERROR;
-+   /* Unregister the service */
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *) handle;
-+   VCHIQ_STATUS_T status = VCHIQ_ERROR;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   vcos_log_info("%d: close_service:%d", service->state->id, service->localport);
-+
-+   if (service->public_fourcc != VCHIQ_FOURCC_INVALID)
-+   {
-+      if (service->srvstate == VCHIQ_SRVSTATE_CLOSEWAIT)
-+      {
-+         /* This is a non-auto-close server */
-+         vchiq_set_service_state(service, VCHIQ_SRVSTATE_LISTENING);
-+         status = VCHIQ_SUCCESS;
-+      }
-+   }
-+   else
-+   {
-+      /* For clients, make it an alias of vchiq_remove_service */
-+      status = vchiq_remove_service(handle);
-+   }
- 
--	unlock_service(service);
--
--	return status;
-+   return status;
- }
- 
- VCHIQ_STATUS_T
- vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
- {
--	/* Unregister the service */
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
--
--	if (!service)
--		return VCHIQ_ERROR;
--
--	vchiq_log_info(vchiq_core_log_level,
--		"%d: remove_service:%d",
--		service->state->id, service->localport);
--
--	/* Make it look like a client, because it must be removed and not
--	   left in the LISTENING state. */
--	service->public_fourcc = VCHIQ_FOURCC_INVALID;
--
--	mark_service_closing(service);
--
--	/* Mark the service for termination by the slot handler */
--	request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
--
--	while (1) {
--		if (down_interruptible(&service->remove_event) != 0) {
--			status = VCHIQ_RETRY;
--			break;
--		}
--
--		if ((service->srvstate == VCHIQ_SRVSTATE_FREE) ||
--			(service->srvstate == VCHIQ_SRVSTATE_OPEN))
--			break;
--
--		vchiq_log_warning(vchiq_core_log_level,
--			"%d: remove_service:%d - waiting in state %s",
--			service->state->id, service->localport,
--			srvstate_names[service->srvstate]);
--	}
--
--	if ((status == VCHIQ_SUCCESS) &&
--		(service->srvstate != VCHIQ_SRVSTATE_FREE))
--		status = VCHIQ_ERROR;
--
--	unlock_service(service);
--
--	return status;
--}
--
--/* This function may be called by kernel threads or user threads.
-- * User threads may receive VCHIQ_RETRY to indicate that a signal has been
-- * received and the call should be retried after being returned to user
-- * context.
-- * When called in blocking mode, the userdata field points to a bulk_waiter
-- * structure.
-- */
--VCHIQ_STATUS_T
--vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
--	VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata,
--	VCHIQ_BULK_MODE_T mode, VCHIQ_BULK_DIR_T dir)
--{
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	VCHIQ_BULK_QUEUE_T *queue;
--	VCHIQ_BULK_T *bulk;
--	VCHIQ_STATE_T *state;
--	struct bulk_waiter *bulk_waiter = NULL;
--	const char dir_char = (dir == VCHIQ_BULK_TRANSMIT) ? 't' : 'r';
--	const int dir_msgtype = (dir == VCHIQ_BULK_TRANSMIT) ?
--		VCHIQ_MSG_BULK_TX : VCHIQ_MSG_BULK_RX;
--	VCHIQ_STATUS_T status = VCHIQ_ERROR;
--
--	if (!service ||
--		 (service->srvstate != VCHIQ_SRVSTATE_OPEN) ||
--		 ((memhandle == VCHI_MEM_HANDLE_INVALID) && (offset == NULL)) ||
--		 (vchiq_check_service(service) != VCHIQ_SUCCESS))
--		goto error_exit;
--
--	switch (mode) {
--	case VCHIQ_BULK_MODE_NOCALLBACK:
--	case VCHIQ_BULK_MODE_CALLBACK:
--		break;
--	case VCHIQ_BULK_MODE_BLOCKING:
--		bulk_waiter = (struct bulk_waiter *)userdata;
--		sema_init(&bulk_waiter->event, 0);
--		bulk_waiter->actual = 0;
--		bulk_waiter->bulk = NULL;
--		break;
--	case VCHIQ_BULK_MODE_WAITING:
--		bulk_waiter = (struct bulk_waiter *)userdata;
--		bulk = bulk_waiter->bulk;
--		goto waiting;
--	default:
--		goto error_exit;
--	}
--
--	state = service->state;
--
--	queue = (dir == VCHIQ_BULK_TRANSMIT) ?
--		&service->bulk_tx : &service->bulk_rx;
--
--	if (mutex_lock_interruptible(&service->bulk_mutex) != 0) {
--		status = VCHIQ_RETRY;
--		goto error_exit;
--	}
--
--	if (queue->local_insert == queue->remove + VCHIQ_NUM_SERVICE_BULKS) {
--		VCHIQ_SERVICE_STATS_INC(service, bulk_stalls);
--		do {
--			mutex_unlock(&service->bulk_mutex);
--			if (down_interruptible(&service->bulk_remove_event)
--				!= 0) {
--				status = VCHIQ_RETRY;
--				goto error_exit;
--			}
--			if (mutex_lock_interruptible(&service->bulk_mutex)
--				!= 0) {
--				status = VCHIQ_RETRY;
--				goto error_exit;
--			}
--		} while (queue->local_insert == queue->remove +
--				VCHIQ_NUM_SERVICE_BULKS);
--	}
--
--	bulk = &queue->bulks[BULK_INDEX(queue->local_insert)];
--
--	bulk->mode = mode;
--	bulk->dir = dir;
--	bulk->userdata = userdata;
--	bulk->size = size;
--	bulk->actual = VCHIQ_BULK_ACTUAL_ABORTED;
--
--	if (vchiq_prepare_bulk_data(bulk, memhandle, offset, size, dir) !=
--		VCHIQ_SUCCESS)
--		goto unlock_error_exit;
--
--	wmb();
--
--	vchiq_log_info(vchiq_core_log_level,
--		"%d: bt (%d->%d) %cx %x@%x %x",
--		state->id,
--		service->localport, service->remoteport, dir_char,
--		size, (unsigned int)bulk->data, (unsigned int)userdata);
--
--	if (state->is_master) {
--		queue->local_insert++;
--		if (resolve_bulks(service, queue))
--			request_poll(state, service,
--				(dir == VCHIQ_BULK_TRANSMIT) ?
--				VCHIQ_POLL_TXNOTIFY : VCHIQ_POLL_RXNOTIFY);
--	} else {
--		int payload[2] = { (int)bulk->data, bulk->size };
--		VCHIQ_ELEMENT_T element = { payload, sizeof(payload) };
--
--		status = queue_message(state, NULL,
--			VCHIQ_MAKE_MSG(dir_msgtype,
--				service->localport, service->remoteport),
--			&element, 1, sizeof(payload), 1);
--		if (status != VCHIQ_SUCCESS) {
--			vchiq_complete_bulk(bulk);
--			goto unlock_error_exit;
--		}
--		queue->local_insert++;
--	}
--
--	mutex_unlock(&service->bulk_mutex);
--
--	vchiq_log_trace(vchiq_core_log_level,
--		"%d: bt:%d %cx li=%x ri=%x p=%x",
--		state->id,
--		service->localport, dir_char,
--		queue->local_insert, queue->remote_insert, queue->process);
--
--waiting:
--	unlock_service(service);
--
--	status = VCHIQ_SUCCESS;
--
--	if (bulk_waiter) {
--		bulk_waiter->bulk = bulk;
--		if (down_interruptible(&bulk_waiter->event) != 0)
--			status = VCHIQ_RETRY;
--		else if (bulk_waiter->actual == VCHIQ_BULK_ACTUAL_ABORTED)
--			status = VCHIQ_ERROR;
--	}
-+   /* Unregister the service */
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *) handle;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   vcos_log_info("%d: remove_service:%d", service->state->id, service->localport);
-+
-+   switch (service->srvstate)
-+   {
-+   case VCHIQ_SRVSTATE_OPENING:
-+   case VCHIQ_SRVSTATE_OPEN:
-+      /* Mark the service for termination by the slot handler */
-+      request_poll(service->state, service, VCHIQ_POLL_TERMINATE);
-+
-+      /* Drop through... */
-+   case VCHIQ_SRVSTATE_CLOSESENT:
-+   case VCHIQ_SRVSTATE_CLOSING:
-+      while ((service->srvstate != VCHIQ_SRVSTATE_CLOSEWAIT) &&
-+         (service->srvstate != VCHIQ_SRVSTATE_LISTENING))
-+      {
-+         if (vcos_event_wait(&service->remove_event) != VCOS_SUCCESS) {
-+            status = VCHIQ_RETRY;
-+            break;
-+         }
-+      }
-+      break;
-+
-+   default:
-+      break;
-+   }
-+
-+   if (status == VCHIQ_SUCCESS) {
-+      if (service->srvstate == VCHIQ_SRVSTATE_OPEN)
-+         status = VCHIQ_ERROR;
-+      else
-+      {
-+         service->instance = NULL;
-+         vchiq_free_service_internal(service);
-+      }
-+   }
-+
-+   return status;
-+}
-+
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_transfer(VCHIQ_SERVICE_T *service,
-+   VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata,
-+   VCHIQ_BULK_MODE_T mode, VCHIQ_BULK_DIR_T dir)
-+{
-+   VCHIQ_BULK_QUEUE_T *queue = (dir == VCHIQ_BULK_TRANSMIT) ?
-+      &service->bulk_tx : &service->bulk_rx;
-+   VCHIQ_BULK_T *bulk;
-+   VCHIQ_STATE_T *state;
-+   BULK_WAITER_T bulk_waiter;
-+   const char dir_char = (dir == VCHIQ_BULK_TRANSMIT) ? 't' : 'r';
-+   const int dir_msgtype = (dir == VCHIQ_BULK_TRANSMIT) ? VCHIQ_MSG_BULK_TX : VCHIQ_MSG_BULK_RX;
-+   VCHIQ_STATUS_T status = VCHIQ_ERROR;
-+
-+   if (!is_valid_service(service) ||
-+       (service->srvstate != VCHIQ_SRVSTATE_OPEN) ||
-+       ((memhandle == VCHI_MEM_HANDLE_INVALID) && (offset == NULL)) ||
-+       (vchiq_check_service(service) != VCHIQ_SUCCESS))
-+      return VCHIQ_ERROR;
-+
-+   state = service->state;
-+
-+   if (vcos_mutex_lock(&service->bulk_mutex) != VCOS_SUCCESS)
-+      return VCHIQ_RETRY;
-+
-+   if (queue->local_insert == queue->remove + VCHIQ_NUM_SERVICE_BULKS)
-+   {
-+      VCHIQ_SERVICE_STATS_INC(service, bulk_stalls);
-+      do {
-+         vcos_mutex_unlock(&service->bulk_mutex);
-+         if (vcos_event_wait(&service->bulk_remove_event) != VCOS_SUCCESS)
-+            return VCHIQ_RETRY;
-+         if (vcos_mutex_lock(&service->bulk_mutex) != VCOS_SUCCESS)
-+            return VCHIQ_RETRY;
-+      } while (queue->local_insert == queue->remove + VCHIQ_NUM_SERVICE_BULKS);
-+   }
-+
-+   bulk = &queue->bulks[BULK_INDEX(queue->local_insert)];
-+
-+   if (mode == VCHIQ_BULK_MODE_BLOCKING)
-+   {
-+      vcos_event_create(&bulk_waiter.event, "bulk_waiter");
-+      bulk_waiter.actual = 0;
-+      userdata = &bulk_waiter;
-+   }
-+
-+   bulk->mode = mode;
-+   bulk->dir = dir;
-+   bulk->userdata = userdata;
-+   bulk->size = size;
-+   bulk->actual = VCHIQ_BULK_ACTUAL_ABORTED;
-+
-+   if (vchiq_prepare_bulk_data(bulk, memhandle, offset, size, dir) != VCHIQ_SUCCESS)
-+   {
-+      goto error_exit;
-+   }
-+
-+   vcos_log_info("%d: bt (%d->%d) %cx %x@%x %x", state->id,
-+      service->localport, service->remoteport, dir_char,
-+      size, (unsigned int)bulk->data, (unsigned int)userdata);
-+
-+   if (state->is_master)
-+   {
-+      queue->local_insert++;
-+      if (resolve_bulks(service, queue))
-+         request_poll(state, service, (dir == VCHIQ_BULK_TRANSMIT) ?
-+            VCHIQ_POLL_TXNOTIFY : VCHIQ_POLL_RXNOTIFY);
-+   }
-+   else
-+   {
-+      int payload[2] = { (int)bulk->data, bulk->size };
-+      VCHIQ_ELEMENT_T element = { payload, sizeof(payload) };
-+
-+      if (queue_message(state, NULL,
-+         VCHIQ_MAKE_MSG(dir_msgtype,
-+            service->localport, service->remoteport),
-+         &element, 1, sizeof(payload), 1) != VCHIQ_SUCCESS)
-+      {
-+         vchiq_complete_bulk(bulk);
-+         goto error_exit;
-+      }
-+      queue->local_insert++;
-+      queue->remote_insert++;
-+   }
-+
-+   vcos_mutex_unlock(&service->bulk_mutex);
-+ 
-+   vcos_log_trace("%d: bt:%d %cx li=%x ri=%x p=%x", state->id,
-+      service->localport, dir_char,
-+      queue->local_insert, queue->remote_insert, queue->process);
-+
-+   status = VCHIQ_SUCCESS;
-+
-+   if (mode == VCHIQ_BULK_MODE_BLOCKING)
-+   {
-+      if (vcos_event_wait(&bulk_waiter.event) != VCOS_SUCCESS)
-+      {
-+         vcos_log_info("bulk wait interrupted");
-+         /* Stop notify_bulks signalling a non-existent waiter */
-+         bulk->userdata = NULL;
-+         status = VCHIQ_ERROR;
-+      }
-+      else if (bulk_waiter.actual == VCHIQ_BULK_ACTUAL_ABORTED)
-+         status = VCHIQ_ERROR;
- 
--	return status;
-+      vcos_event_delete(&bulk_waiter.event);
-+   }
- 
--unlock_error_exit:
--	mutex_unlock(&service->bulk_mutex);
-+   return status;
- 
- error_exit:
--	if (service)
--		unlock_service(service);
--	return status;
-+   if (mode == VCHIQ_BULK_MODE_BLOCKING)
-+      vcos_event_delete(&bulk_waiter.event);
-+   vcos_mutex_unlock(&service->bulk_mutex);
-+
-+   return status;
- }
- 
- VCHIQ_STATUS_T
--vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
--	const VCHIQ_ELEMENT_T *elements, int count)
-+vchiq_queue_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle,
-+   const void *data, int size, void *userdata)
- {
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	VCHIQ_STATUS_T status = VCHIQ_ERROR;
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      VCHI_MEM_HANDLE_INVALID, (void *)data, size, userdata,
-+      VCHIQ_BULK_MODE_CALLBACK, VCHIQ_BULK_TRANSMIT);
-+}
- 
--	unsigned int size = 0;
--	unsigned int i;
-+VCHIQ_STATUS_T
-+vchiq_queue_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data, int size,
-+   void *userdata)
-+{
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      VCHI_MEM_HANDLE_INVALID, data, size, userdata,
-+      VCHIQ_BULK_MODE_CALLBACK, VCHIQ_BULK_RECEIVE);
-+}
- 
--	if (!service ||
--		(vchiq_check_service(service) != VCHIQ_SUCCESS))
--		goto error_exit;
--
--	for (i = 0; i < (unsigned int)count; i++) {
--		if (elements[i].size) {
--			if (elements[i].data == NULL) {
--				VCHIQ_SERVICE_STATS_INC(service, error_count);
--				goto error_exit;
--			}
--			size += elements[i].size;
--		}
--	}
--
--	if (size > VCHIQ_MAX_MSG_SIZE) {
--		VCHIQ_SERVICE_STATS_INC(service, error_count);
--		goto error_exit;
--	}
--
--	switch (service->srvstate) {
--	case VCHIQ_SRVSTATE_OPEN:
--		status = queue_message(service->state, service,
--				VCHIQ_MAKE_MSG(VCHIQ_MSG_DATA,
--					service->localport,
--					service->remoteport),
--				elements, count, size, 1);
--		break;
--	case VCHIQ_SRVSTATE_OPENSYNC:
--		status = queue_message_sync(service->state, service,
--				VCHIQ_MAKE_MSG(VCHIQ_MSG_DATA,
--					service->localport,
--					service->remoteport),
--				elements, count, size, 1);
--		break;
--	default:
--		status = VCHIQ_ERROR;
--		break;
--	}
-+VCHIQ_STATUS_T
-+vchiq_queue_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle, const void *offset, int size, void *userdata)
-+{
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      memhandle, (void *)offset, size, userdata,
-+      VCHIQ_BULK_MODE_CALLBACK, VCHIQ_BULK_TRANSMIT);
-+}
- 
--error_exit:
--	if (service)
--		unlock_service(service);
-+VCHIQ_STATUS_T
-+vchiq_queue_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata)
-+{
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      memhandle, offset, size, userdata,
-+      VCHIQ_BULK_MODE_CALLBACK, VCHIQ_BULK_RECEIVE);
-+}
- 
--	return status;
-+VCHIQ_STATUS_T
-+vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data, int size,
-+   void *userdata, VCHIQ_BULK_MODE_T mode)
-+{
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      VCHI_MEM_HANDLE_INVALID, (void *)data, size, userdata,
-+      mode, VCHIQ_BULK_TRANSMIT);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data, int size,
-+   void *userdata, VCHIQ_BULK_MODE_T mode)
-+{
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      VCHI_MEM_HANDLE_INVALID, data, size, userdata,
-+      mode, VCHIQ_BULK_RECEIVE);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle, const void *offset, int size, void *userdata,
-+   VCHIQ_BULK_MODE_T mode)
-+{
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      memhandle, (void *)offset, size, userdata,
-+      mode, VCHIQ_BULK_TRANSMIT);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata,
-+   VCHIQ_BULK_MODE_T mode)
-+{
-+   return vchiq_bulk_transfer((VCHIQ_SERVICE_T *)handle,
-+      memhandle, offset, size, userdata,
-+      mode, VCHIQ_BULK_RECEIVE);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
-+   const VCHIQ_ELEMENT_T *elements, int count)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *) handle;
-+
-+   unsigned int size = 0;
-+   unsigned int i;
-+
-+   if (!is_valid_service(service) ||
-+      (service->srvstate != VCHIQ_SRVSTATE_OPEN) ||
-+      (vchiq_check_service(service) != VCHIQ_SUCCESS))
-+      return VCHIQ_ERROR;
-+
-+   for (i = 0; i < (unsigned int)count; i++)
-+   {
-+      if (elements[i].size)
-+      {
-+         if (elements[i].data == NULL)
-+         {
-+            VCHIQ_SERVICE_STATS_INC(service, error_count);
-+            return VCHIQ_ERROR;
-+         }
-+         size += elements[i].size;
-+      }
-+   }
-+
-+   if (size > VCHIQ_MAX_MSG_SIZE)
-+   {
-+      VCHIQ_SERVICE_STATS_INC(service, error_count);
-+      return VCHIQ_ERROR;
-+   }
-+
-+   return queue_message(service->state, service,
-+            VCHIQ_MAKE_MSG(VCHIQ_MSG_DATA, service->localport,
-+               service->remoteport), elements, count, size, 1);
- }
- 
- void
- vchiq_release_message(VCHIQ_SERVICE_HANDLE_T handle, VCHIQ_HEADER_T *header)
- {
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	VCHIQ_SHARED_STATE_T *remote;
--	VCHIQ_STATE_T *state;
--	int slot_index;
--
--	if (!service)
--		return;
--
--	state = service->state;
--	remote = state->remote;
--
--	slot_index = SLOT_INDEX_FROM_DATA(state, (void *)header);
--
--	if ((slot_index >= remote->slot_first) &&
--		(slot_index <= remote->slot_last)) {
--		int msgid = header->msgid;
--		if (msgid & VCHIQ_MSGID_CLAIMED) {
--			VCHIQ_SLOT_INFO_T *slot_info =
--				SLOT_INFO_FROM_INDEX(state, slot_index);
--
--			release_slot(state, slot_info, header, service);
--		}
--	} else if (slot_index == remote->slot_sync)
--		release_message_sync(state, header);
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_STATE_T *state;
-+   int slot_index;
-+   int msgid;
-+
-+   if (!is_valid_service(service))
-+      return;
-+
-+   state = service->state;
- 
--	unlock_service(service);
-+   slot_index = SLOT_INDEX_FROM_DATA(state, (void *)header);
-+
-+   if ((slot_index >= state->remote->slot_first) &&
-+      (slot_index <= state->remote->slot_last) &&
-+      ((msgid = header->msgid) & VCHIQ_MSGID_CLAIMED))
-+   {
-+      VCHIQ_SLOT_INFO_T *slot_info = SLOT_INFO_FROM_INDEX(state, slot_index);
-+
-+      /* Rewrite the message header to prevent a double release */
-+      header->msgid = msgid & ~VCHIQ_MSGID_CLAIMED;
-+
-+      release_slot(state, slot_info);
-+   }
- }
- 
--static void
--release_message_sync(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header)
-+int
-+vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T handle)
- {
--	header->msgid = VCHIQ_MSGID_PADDING;
--	wmb();
--	remote_event_signal(&state->remote->sync_release);
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   return service ? service->client_id : 0;
- }
- 
- VCHIQ_STATUS_T
- vchiq_get_config(VCHIQ_INSTANCE_T instance,
--	int config_size, VCHIQ_CONFIG_T *pconfig)
-+   int config_size, VCHIQ_CONFIG_T *pconfig)
- {
--	VCHIQ_CONFIG_T config;
-+   VCHIQ_CONFIG_T config;
- 
--	(void)instance;
-+   vcos_unused(instance);
- 
--	config.max_msg_size           = VCHIQ_MAX_MSG_SIZE;
--	config.bulk_threshold         = VCHIQ_MAX_MSG_SIZE;
--	config.max_outstanding_bulks  = VCHIQ_NUM_SERVICE_BULKS;
--	config.max_services           = VCHIQ_MAX_SERVICES;
--	config.version                = VCHIQ_VERSION;
--	config.version_min            = VCHIQ_VERSION_MIN;
-+   config.max_msg_size           = VCHIQ_MAX_MSG_SIZE;
-+   config.bulk_threshold         = VCHIQ_MAX_MSG_SIZE;
-+   config.max_outstanding_bulks  = VCHIQ_NUM_SERVICE_BULKS;
-+   config.max_services           = VCHIQ_MAX_SERVICES;
-+   config.version                = VCHIQ_VERSION;
-+   config.version_min            = VCHIQ_VERSION_MIN;
- 
--	if (config_size > sizeof(VCHIQ_CONFIG_T))
--		return VCHIQ_ERROR;
-+   if (config_size > sizeof(VCHIQ_CONFIG_T))
-+      return VCHIQ_ERROR;
- 
--	memcpy(pconfig, &config,
--		min(config_size, (int)(sizeof(VCHIQ_CONFIG_T))));
-+   memcpy(pconfig, &config, vcos_min(config_size, sizeof(VCHIQ_CONFIG_T)));
- 
--	return VCHIQ_SUCCESS;
-+   return VCHIQ_SUCCESS;
- }
- 
- VCHIQ_STATUS_T
- vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T handle,
--	VCHIQ_SERVICE_OPTION_T option, int value)
-+   VCHIQ_SERVICE_OPTION_T option, int value)
- {
--	VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
--	VCHIQ_STATUS_T status = VCHIQ_ERROR;
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_STATUS_T status = VCHIQ_ERROR;
- 
--	if (service) {
--		switch (option) {
--		case VCHIQ_SERVICE_OPTION_AUTOCLOSE:
--			service->auto_close = value;
--			status = VCHIQ_SUCCESS;
--			break;
--
--		case VCHIQ_SERVICE_OPTION_SLOT_QUOTA: {
--			VCHIQ_SERVICE_QUOTA_T *service_quota =
--				&service->state->service_quotas[
--					service->localport];
--			if (value == 0)
--				value = service->state->default_slot_quota;
--			if ((value >= service_quota->slot_use_count) &&
--				 (value < (unsigned short)~0)) {
--				service_quota->slot_quota = value;
--				if ((value >= service_quota->slot_use_count) &&
--					(service_quota->message_quota >=
--					 service_quota->message_use_count)) {
--					/* Signal the service that it may have
--					** dropped below its quota */
--					up(&service_quota->quota_event);
--				}
--				status = VCHIQ_SUCCESS;
--			}
--		} break;
--
--		case VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA: {
--			VCHIQ_SERVICE_QUOTA_T *service_quota =
--				&service->state->service_quotas[
--					service->localport];
--			if (value == 0)
--				value = service->state->default_message_quota;
--			if ((value >= service_quota->message_use_count) &&
--				 (value < (unsigned short)~0)) {
--				service_quota->message_quota = value;
--				if ((value >=
--					service_quota->message_use_count) &&
--					(service_quota->slot_quota >=
--					service_quota->slot_use_count))
--					/* Signal the service that it may have
--					** dropped below its quota */
--					up(&service_quota->quota_event);
--				status = VCHIQ_SUCCESS;
--			}
--		} break;
--
--		case VCHIQ_SERVICE_OPTION_SYNCHRONOUS:
--			if ((service->srvstate == VCHIQ_SRVSTATE_HIDDEN) ||
--				(service->srvstate ==
--				VCHIQ_SRVSTATE_LISTENING)) {
--				service->sync = value;
--				status = VCHIQ_SUCCESS;
--			}
--			break;
--
--		default:
--			break;
--		}
--		unlock_service(service);
--	}
-+   if (is_valid_service(service))
-+   {
-+      switch (option)
-+      {
-+      case VCHIQ_SERVICE_OPTION_AUTOCLOSE:
-+         service->auto_close = value;
-+         status = VCHIQ_SUCCESS;
-+         break;
-+
-+      case VCHIQ_SERVICE_OPTION_SLOT_QUOTA:
-+         {
-+            VCHIQ_SERVICE_QUOTA_T *service_quota =
-+               &service->state->service_quotas[service->localport];
-+            if (value == 0)
-+               value = service->state->default_slot_quota;
-+            if ((value >= service_quota->slot_use_count) &&
-+                (value < (unsigned short)~0))
-+            {
-+               service_quota->slot_quota = value;
-+               if ((value >= service_quota->slot_use_count) &&
-+                   (service_quota->message_quota >= service_quota->message_use_count))
-+               {
-+                  /* Signal the service that it may have dropped below its quota */
-+                  vcos_event_signal(&service_quota->quota_event);
-+               }
-+               status = VCHIQ_SUCCESS;
-+            }
-+         }
-+         break;
-+
-+      case VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA:
-+         {
-+            VCHIQ_SERVICE_QUOTA_T *service_quota =
-+               &service->state->service_quotas[service->localport];
-+            if (value == 0)
-+               value = service->state->default_message_quota;
-+            if ((value >= service_quota->message_use_count) &&
-+                (value < (unsigned short)~0))
-+            {
-+               service_quota->message_quota = value;
-+               if ((value >= service_quota->message_use_count) &&
-+                   (service_quota->slot_quota >= service_quota->slot_use_count))
-+               {
-+                  /* Signal the service that it may have dropped below its quota */
-+                  vcos_event_signal(&service_quota->quota_event);
-+               }
-+               status = VCHIQ_SUCCESS;
-+            }
-+         }
-+         break;
-+
-+      default:
-+         break;
-+      }
-+   }
- 
--	return status;
-+   return status;
- }
- 
- void
- vchiq_dump_shared_state(void *dump_context, VCHIQ_STATE_T *state,
--	VCHIQ_SHARED_STATE_T *shared, const char *label)
-+   VCHIQ_SHARED_STATE_T *shared, const char *label)
- {
--	static const char *const debug_names[] = {
--		"<entries>",
--		"SLOT_HANDLER_COUNT",
--		"SLOT_HANDLER_LINE",
--		"PARSE_LINE",
--		"PARSE_HEADER",
--		"PARSE_MSGID",
--		"AWAIT_COMPLETION_LINE",
--		"DEQUEUE_MESSAGE_LINE",
--		"SERVICE_CALLBACK_LINE",
--		"MSG_QUEUE_FULL_COUNT",
--		"COMPLETION_QUEUE_FULL_COUNT"
--	};
--	int i;
--
--	char buf[80];
--	int len;
--	len = snprintf(buf, sizeof(buf),
--		"  %s: slots %d-%d tx_pos=%x recycle=%x",
--		label, shared->slot_first, shared->slot_last,
--		shared->tx_pos, shared->slot_queue_recycle);
--	vchiq_dump(dump_context, buf, len + 1);
--
--	len = snprintf(buf, sizeof(buf),
--		"    Slots claimed:");
--	vchiq_dump(dump_context, buf, len + 1);
--
--	for (i = shared->slot_first; i <= shared->slot_last; i++) {
--		VCHIQ_SLOT_INFO_T slot_info = *SLOT_INFO_FROM_INDEX(state, i);
--		if (slot_info.use_count != slot_info.release_count) {
--			len = snprintf(buf, sizeof(buf),
--				"      %d: %d/%d", i, slot_info.use_count,
--				slot_info.release_count);
--			vchiq_dump(dump_context, buf, len + 1);
--		}
--	}
--
--	for (i = 1; i < shared->debug[DEBUG_ENTRIES]; i++) {
--		len = snprintf(buf, sizeof(buf), "    DEBUG: %s = %d(%x)",
--			debug_names[i], shared->debug[i], shared->debug[i]);
--		vchiq_dump(dump_context, buf, len + 1);
--	}
-+   static const char *const debug_names[] =
-+   {
-+      "<entries>",
-+      "SLOT_HANDLER_COUNT",
-+      "SLOT_HANDLER_LINE",
-+      "PARSE_LINE",
-+      "PARSE_HEADER",
-+      "PARSE_MSGID",
-+      "AWAIT_COMPLETION_LINE",
-+      "DEQUEUE_MESSAGE_LINE",
-+      "SERVICE_CALLBACK_LINE",
-+      "MSG_QUEUE_FULL_COUNT",
-+      "COMPLETION_QUEUE_FULL_COUNT"
-+   };
-+   int i;
-+
-+   char buf[80];
-+   int len;
-+   len = vcos_snprintf(buf, sizeof(buf),
-+      "  %s: slots %d-%d tx_pos=%x recycle=%x",
-+      label, shared->slot_first, shared->slot_last,
-+      shared->tx_pos, shared->slot_queue_recycle);
-+   vchiq_dump(dump_context, buf, len + 1);
-+
-+   len = vcos_snprintf(buf, sizeof(buf),
-+      "    Slots claimed:"); 
-+   vchiq_dump(dump_context, buf, len + 1);
-+
-+   for (i = shared->slot_first; i <= shared->slot_last; i++)
-+   {
-+      VCHIQ_SLOT_INFO_T slot_info = *SLOT_INFO_FROM_INDEX(state, i);
-+      if (slot_info.use_count != slot_info.release_count)
-+      {
-+         len = vcos_snprintf(buf, sizeof(buf),
-+            "      %d: %d/%d", i, slot_info.use_count, slot_info.release_count);
-+         vchiq_dump(dump_context, buf, len + 1);
-+      }
-+   }
-+
-+   for (i = 1; i < shared->debug[DEBUG_ENTRIES]; i++)
-+   {
-+      len = vcos_snprintf(buf, sizeof(buf), "    DEBUG: %s = %d(%x)",
-+         debug_names[i], shared->debug[i], shared->debug[i]);
-+      vchiq_dump(dump_context, buf, len + 1);
-+   }
- }
- 
- void
- vchiq_dump_state(void *dump_context, VCHIQ_STATE_T *state)
- {
--	char buf[80];
--	int len;
--	int i;
--
--	len = snprintf(buf, sizeof(buf), "State %d: %s", state->id,
--		conn_state_names[state->conn_state]);
--	vchiq_dump(dump_context, buf, len + 1);
--
--	len = snprintf(buf, sizeof(buf),
--		"  tx_pos=%x(@%x), rx_pos=%x(@%x)",
--		state->local->tx_pos,
--		(uint32_t)state->tx_data +
--			(state->local_tx_pos & VCHIQ_SLOT_MASK),
--		state->rx_pos,
--		(uint32_t)state->rx_data +
--			(state->rx_pos & VCHIQ_SLOT_MASK));
--	vchiq_dump(dump_context, buf, len + 1);
--
--	len = snprintf(buf, sizeof(buf),
--		"  Version: %d (min %d)",
--		VCHIQ_VERSION, VCHIQ_VERSION_MIN);
--	vchiq_dump(dump_context, buf, len + 1);
--
--	if (VCHIQ_ENABLE_STATS) {
--		len = snprintf(buf, sizeof(buf),
--			"  Stats: ctrl_tx_count=%d, ctrl_rx_count=%d, "
--			"error_count=%d",
--			state->stats.ctrl_tx_count, state->stats.ctrl_rx_count,
--			state->stats.error_count);
--		vchiq_dump(dump_context, buf, len + 1);
--	}
--
--	len = snprintf(buf, sizeof(buf),
--		"  Slots: %d available (%d data), %d recyclable, %d stalls (%d data)",
--		state->slot_queue_available -
--			SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos),
--		state->data_quota - state->data_use_count,
--		state->local->slot_queue_recycle - state->slot_queue_available,
--		state->stats.slot_stalls, state->stats.data_stalls);
--	vchiq_dump(dump_context, buf, len + 1);
--
--	vchiq_dump_platform_state(dump_context);
--
--	vchiq_dump_shared_state(dump_context, state, state->local, "Local");
--	vchiq_dump_shared_state(dump_context, state, state->remote, "Remote");
--
--	vchiq_dump_platform_instances(dump_context);
--
--	for (i = 0; i < state->unused_service; i++) {
--		VCHIQ_SERVICE_T *service = find_service_by_port(state, i);
--
--		if (service) {
--			vchiq_dump_service_state(dump_context, service);
--			unlock_service(service);
--		}
--	}
-+   char buf[80];
-+   int len;
-+   int i;
-+
-+   len = vcos_snprintf(buf, sizeof(buf), "State %d: %s", state->id,
-+      conn_state_names[state->conn_state]);
-+   vchiq_dump(dump_context, buf, len + 1);
-+
-+   len = vcos_snprintf(buf, sizeof(buf),
-+      "  tx_pos=%x(@%x), rx_pos=%x(@%x)",
-+      state->id, state->local->tx_pos,
-+      (uint32_t)state->tx_data + (state->local_tx_pos & VCHIQ_SLOT_MASK),
-+      state->rx_pos,
-+      (uint32_t)state->rx_data + (state->rx_pos & VCHIQ_SLOT_MASK));
-+   vchiq_dump(dump_context, buf, len + 1);
-+
-+   len = vcos_snprintf(buf, sizeof(buf),
-+      "  Version: %d (min %d)",
-+      VCHIQ_VERSION, VCHIQ_VERSION_MIN);
-+   vchiq_dump(dump_context, buf, len + 1);
-+
-+   if (VCHIQ_ENABLE_STATS)
-+   {
-+      len = vcos_snprintf(buf, sizeof(buf),
-+         "  Stats: ctrl_tx_count=%d, ctrl_rx_count=%d, error_count=%d",
-+         state->stats.ctrl_tx_count, state->stats.ctrl_rx_count,
-+         state->stats.slot_stalls);
-+      vchiq_dump(dump_context, buf, len + 1);
-+   }
-+
-+   len = vcos_snprintf(buf, sizeof(buf),
-+      "  Slots: %d available, %d recyclable, %d stalls",
-+      state->slot_queue_available - SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos),
-+      state->local->slot_queue_recycle - state->slot_queue_available,
-+      state->stats.slot_stalls);
-+   vchiq_dump(dump_context, buf, len + 1);
-+
-+   vchiq_dump_platform_state(dump_context);
-+
-+   vchiq_dump_shared_state(dump_context, state, state->local, "Local");
-+   vchiq_dump_shared_state(dump_context, state, state->remote, "Remote");
-+
-+   vchiq_dump_platform_instances(dump_context);
-+
-+   for (i = 0; i < state->unused_service; i++) {
-+      VCHIQ_SERVICE_T *service = state->services[i];
-+
-+      if (service && (service->srvstate != VCHIQ_SRVSTATE_FREE))
-+         vchiq_dump_service_state(dump_context, service);
-+   }
- }
- 
- void
- vchiq_dump_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
- {
--	char buf[80];
--	int len;
--
--	len = snprintf(buf, sizeof(buf), "Service %d: %s (ref %u)",
--		service->localport, srvstate_names[service->srvstate],
--		service->ref_count - 1); /*Don't include the lock just taken*/
--
--	if (service->srvstate != VCHIQ_SRVSTATE_FREE) {
--		char remoteport[30];
--		VCHIQ_SERVICE_QUOTA_T *service_quota =
--			&service->state->service_quotas[service->localport];
--		int fourcc = service->base.fourcc;
--		int tx_pending, rx_pending;
--		if (service->remoteport != VCHIQ_PORT_FREE) {
--			int len2 = snprintf(remoteport, sizeof(remoteport),
--				"%d", service->remoteport);
--			if (service->public_fourcc != VCHIQ_FOURCC_INVALID)
--				snprintf(remoteport + len2,
--					sizeof(remoteport) - len2,
--					" (client %x)", service->client_id);
--		} else
--			strcpy(remoteport, "n/a");
--
--		len += snprintf(buf + len, sizeof(buf) - len,
--			" '%c%c%c%c' remote %s (msg use %d/%d, slot use %d/%d)",
--			VCHIQ_FOURCC_AS_4CHARS(fourcc),
--			remoteport,
--			service_quota->message_use_count,
--			service_quota->message_quota,
--			service_quota->slot_use_count,
--			service_quota->slot_quota);
--
--		vchiq_dump(dump_context, buf, len + 1);
--
--		tx_pending = service->bulk_tx.local_insert -
--			service->bulk_tx.remote_insert;
--
--		rx_pending = service->bulk_rx.local_insert -
--			service->bulk_rx.remote_insert;
--
--		len = snprintf(buf, sizeof(buf),
--			"  Bulk: tx_pending=%d (size %d),"
--			" rx_pending=%d (size %d)",
--			tx_pending,
--			tx_pending ? service->bulk_tx.bulks[
--			BULK_INDEX(service->bulk_tx.remove)].size : 0,
--			rx_pending,
--			rx_pending ? service->bulk_rx.bulks[
--			BULK_INDEX(service->bulk_rx.remove)].size : 0);
--
--		if (VCHIQ_ENABLE_STATS) {
--			vchiq_dump(dump_context, buf, len + 1);
--
--			len = snprintf(buf, sizeof(buf),
--				"  Ctrl: tx_count=%d, tx_bytes=%llu, "
--				"rx_count=%d, rx_bytes=%llu",
--				service->stats.ctrl_tx_count,
--				service->stats.ctrl_tx_bytes,
--				service->stats.ctrl_rx_count,
--				service->stats.ctrl_rx_bytes);
--			vchiq_dump(dump_context, buf, len + 1);
--
--			len = snprintf(buf, sizeof(buf),
--				"  Bulk: tx_count=%d, tx_bytes=%llu, "
--				"rx_count=%d, rx_bytes=%llu",
--				service->stats.bulk_tx_count,
--				service->stats.bulk_tx_bytes,
--				service->stats.bulk_rx_count,
--				service->stats.bulk_rx_bytes);
--			vchiq_dump(dump_context, buf, len + 1);
--
--			len = snprintf(buf, sizeof(buf),
--				"  %d quota stalls, %d slot stalls, "
--				"%d bulk stalls, %d aborted, %d errors",
--				service->stats.quota_stalls,
--				service->stats.slot_stalls,
--				service->stats.bulk_stalls,
--				service->stats.bulk_aborted_count,
--				service->stats.error_count);
--		 }
--	}
--
--	vchiq_dump(dump_context, buf, len + 1);
--
--	if (service->srvstate != VCHIQ_SRVSTATE_FREE)
--		vchiq_dump_platform_service_state(dump_context, service);
--}
-+   char buf[80];
-+   int len;
- 
-+   len = vcos_snprintf(buf, sizeof(buf), "Service %d: %s",
-+      service->localport, srvstate_names[service->srvstate]);
- 
--void
--vchiq_loud_error_header(void)
--{
--	vchiq_log_error(vchiq_core_log_level,
--		"============================================================"
--		"================");
--	vchiq_log_error(vchiq_core_log_level,
--		"============================================================"
--		"================");
--	vchiq_log_error(vchiq_core_log_level, "=====");
--}
--
--void
--vchiq_loud_error_footer(void)
--{
--	vchiq_log_error(vchiq_core_log_level, "=====");
--	vchiq_log_error(vchiq_core_log_level,
--		"============================================================"
--		"================");
--	vchiq_log_error(vchiq_core_log_level,
--		"============================================================"
--		"================");
--}
--
--
--VCHIQ_STATUS_T vchiq_send_remote_use(VCHIQ_STATE_T *state)
--{
--	VCHIQ_STATUS_T status = VCHIQ_RETRY;
--	if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
--		status = queue_message(state, NULL,
--			VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE, 0, 0),
--			NULL, 0, 0, 0);
--	return status;
--}
--
--VCHIQ_STATUS_T vchiq_send_remote_release(VCHIQ_STATE_T *state)
--{
--	VCHIQ_STATUS_T status = VCHIQ_RETRY;
--	if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
--		status = queue_message(state, NULL,
--			VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_RELEASE, 0, 0),
--			NULL, 0, 0, 0);
--	return status;
--}
--
--VCHIQ_STATUS_T vchiq_send_remote_use_active(VCHIQ_STATE_T *state)
--{
--	VCHIQ_STATUS_T status = VCHIQ_RETRY;
--	if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
--		status = queue_message(state, NULL,
--			VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE_ACTIVE, 0, 0),
--			NULL, 0, 0, 0);
--	return status;
--}
--
--void vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
--	size_t numBytes)
--{
--	const uint8_t  *mem = (const uint8_t *)voidMem;
--	size_t          offset;
--	char            lineBuf[100];
--	char           *s;
--
--	while (numBytes > 0) {
--		s = lineBuf;
--
--		for (offset = 0; offset < 16; offset++) {
--			if (offset < numBytes)
--				s += snprintf(s, 4, "%02x ", mem[offset]);
--			else
--				s += snprintf(s, 4, "   ");
--		}
--
--		for (offset = 0; offset < 16; offset++) {
--			if (offset < numBytes) {
--				uint8_t ch = mem[offset];
--
--				if ((ch < ' ') || (ch > '~'))
--					ch = '.';
--				*s++ = (char)ch;
--			}
--		}
--		*s++ = '\0';
--
--		if ((label != NULL) && (*label != '\0'))
--			vchiq_log_trace(VCHIQ_LOG_TRACE,
--				"%s: %08x: %s", label, addr, lineBuf);
--		else
--			vchiq_log_trace(VCHIQ_LOG_TRACE,
--				"%08x: %s", addr, lineBuf);
--
--		addr += 16;
--		mem += 16;
--		if (numBytes > 16)
--			numBytes -= 16;
--		else
--			numBytes = 0;
--	}
-+   if (service->srvstate != VCHIQ_SRVSTATE_FREE)
-+   {
-+      char remoteport[30];
-+      VCHIQ_SERVICE_QUOTA_T *service_quota =
-+         &service->state->service_quotas[service->localport];
-+      int fourcc = service->base.fourcc;
-+      if (service->remoteport != VCHIQ_PORT_FREE)
-+      {
-+         int len2 = vcos_snprintf(remoteport, sizeof(remoteport), "%d",
-+            service->remoteport);
-+         if (service->public_fourcc != VCHIQ_FOURCC_INVALID)
-+            vcos_snprintf(remoteport + len2, sizeof(remoteport) - len2,
-+               " (client %x)", service->client_id);
-+      }
-+      else
-+         vcos_strcpy(remoteport, "n/a");
-+
-+      len += vcos_snprintf(buf + len, sizeof(buf) - len,
-+         " '%c%c%c%c' remote %s (msg use %d/%d, slot use %d/%d)",
-+         VCHIQ_FOURCC_AS_4CHARS(fourcc),
-+         remoteport,
-+         service_quota->message_use_count,
-+         service_quota->message_quota,
-+         service_quota->slot_use_count,
-+         service_quota->slot_quota);
-+
-+      if (VCHIQ_ENABLE_STATS)
-+      {
-+         vchiq_dump(dump_context, buf, len + 1);
-+
-+         len = vcos_snprintf(buf, sizeof(buf),
-+            "  Ctrl: tx_count=%d, tx_bytes=%" PRIu64 ", rx_count=%d, rx_bytes=%" PRIu64,
-+            service->stats.ctrl_tx_count, service->stats.ctrl_tx_bytes,
-+            service->stats.ctrl_rx_count, service->stats.ctrl_rx_bytes);
-+         vchiq_dump(dump_context, buf, len + 1);
-+
-+         len = vcos_snprintf(buf, sizeof(buf),
-+            "  Bulk: tx_count=%d, tx_bytes=%" PRIu64 ", rx_count=%d, rx_bytes=%" PRIu64,
-+            service->stats.bulk_tx_count, service->stats.bulk_tx_bytes,
-+            service->stats.bulk_rx_count, service->stats.bulk_rx_bytes);
-+         vchiq_dump(dump_context, buf, len + 1);
-+
-+         len = vcos_snprintf(buf, sizeof(buf),
-+            "  %d quota stalls, %d slot stalls, %d bulk stalls, %d aborted, %d errors",
-+            service->stats.quota_stalls, service->stats.slot_stalls,
-+            service->stats.bulk_stalls, service->stats.bulk_aborted_count,
-+            service->stats.error_count);
-+       }
-+   }
-+
-+   vchiq_dump(dump_context, buf, len + 1);
-+
-+   vchiq_dump_platform_service_state(dump_context, service);
-+}
-+
-+
-+VCHIQ_STATUS_T vchiq_send_remote_use(VCHIQ_STATE_T * state)
-+{
-+   VCHIQ_STATUS_T status = VCHIQ_RETRY;
-+   if(state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
-+   {
-+      status = queue_message(state, NULL, VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE, 0, 0), NULL, 0, 0, 0);
-+   }
-+   return status;
-+}
-+
-+VCHIQ_STATUS_T vchiq_send_remote_release(VCHIQ_STATE_T * state)
-+{
-+   VCHIQ_STATUS_T status = VCHIQ_RETRY;
-+   if(state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
-+   {
-+      status = queue_message(state, NULL, VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_RELEASE, 0, 0), NULL, 0, 0, 0);
-+   }
-+   return status;
-+}
-+
-+VCHIQ_STATUS_T vchiq_send_remote_use_active(VCHIQ_STATE_T * state)
-+{
-+   VCHIQ_STATUS_T status = VCHIQ_RETRY;
-+   if(state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
-+   {
-+      status = queue_message(state, NULL, VCHIQ_MAKE_MSG(VCHIQ_MSG_REMOTE_USE_ACTIVE, 0, 0), NULL, 0, 0, 0);
-+   }
-+   return status;
- }
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h	2012-10-21 15:15:10.015260026 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h	2012-10-17 18:57:47.000000000 +0200
-@@ -19,105 +19,58 @@
- #ifndef VCHIQ_CORE_H
- #define VCHIQ_CORE_H
- 
--#include <linux/mutex.h>
--#include <linux/semaphore.h>
--#include <linux/kthread.h>
--
- #include "vchiq_cfg.h"
- 
- #include "vchiq.h"
- 
--/* Run time control of log level, based on KERN_XXX level. */
--#define VCHIQ_LOG_DEFAULT  4
--#define VCHIQ_LOG_ERROR    3
--#define VCHIQ_LOG_WARNING  4
--#define VCHIQ_LOG_INFO     6
--#define VCHIQ_LOG_TRACE    7
--
--#define VCHIQ_LOG_PREFIX   KERN_INFO "vchiq: "
--
--#ifndef vchiq_log_error
--#define vchiq_log_error(cat, fmt, ...) \
--	do { if (cat >= VCHIQ_LOG_ERROR) \
--		printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0)
--#endif
--#ifndef vchiq_log_warning
--#define vchiq_log_warning(cat, fmt, ...) \
--	do { if (cat >= VCHIQ_LOG_WARNING) \
--		 printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0)
--#endif
--#ifndef vchiq_log_info
--#define vchiq_log_info(cat, fmt, ...) \
--	do { if (cat >= VCHIQ_LOG_INFO) \
--		printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0)
--#endif
--#ifndef vchiq_log_trace
--#define vchiq_log_trace(cat, fmt, ...) \
--	do { if (cat >= VCHIQ_LOG_TRACE) \
--		printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0)
--#endif
--
--#define vchiq_loud_error(...) \
--	vchiq_log_error(vchiq_core_log_level, "===== " __VA_ARGS__)
--
--#ifndef vchiq_static_assert
--#define vchiq_static_assert(cond) __attribute__((unused)) \
--	extern int vchiq_static_assert[(cond) ? 1 : -1]
--#endif
--
- #define IS_POW2(x) (x && ((x & (x - 1)) == 0))
- 
- /* Ensure that the slot size and maximum number of slots are powers of 2 */
--vchiq_static_assert(IS_POW2(VCHIQ_SLOT_SIZE));
--vchiq_static_assert(IS_POW2(VCHIQ_MAX_SLOTS));
--vchiq_static_assert(IS_POW2(VCHIQ_MAX_SLOTS_PER_SIDE));
-+vcos_static_assert(IS_POW2(VCHIQ_SLOT_SIZE));
-+vcos_static_assert(IS_POW2(VCHIQ_MAX_SLOTS));
-+vcos_static_assert(IS_POW2(VCHIQ_MAX_SLOTS_PER_SIDE));
- 
- #define VCHIQ_SLOT_MASK        (VCHIQ_SLOT_SIZE - 1)
- #define VCHIQ_SLOT_QUEUE_MASK  (VCHIQ_MAX_SLOTS_PER_SIDE - 1)
- #define VCHIQ_SLOT_ZERO_SLOTS  ((sizeof(VCHIQ_SLOT_ZERO_T) + \
--	VCHIQ_SLOT_SIZE - 1) / VCHIQ_SLOT_SIZE)
-+   VCHIQ_SLOT_SIZE - 1) / VCHIQ_SLOT_SIZE)
- 
--#define VCHIQ_MSG_PADDING            0  /* -                                 */
--#define VCHIQ_MSG_CONNECT            1  /* -                                 */
--#define VCHIQ_MSG_OPEN               2  /* + (srcport, -), fourcc, client_id */
--#define VCHIQ_MSG_OPENACK            3  /* + (srcport, dstport)              */
--#define VCHIQ_MSG_CLOSE              4  /* + (srcport, dstport)              */
--#define VCHIQ_MSG_DATA               5  /* + (srcport, dstport)              */
--#define VCHIQ_MSG_BULK_RX            6  /* + (srcport, dstport), data, size  */
--#define VCHIQ_MSG_BULK_TX            7  /* + (srcport, dstport), data, size  */
--#define VCHIQ_MSG_BULK_RX_DONE       8  /* + (srcport, dstport), actual      */
--#define VCHIQ_MSG_BULK_TX_DONE       9  /* + (srcport, dstport), actual      */
--#define VCHIQ_MSG_PAUSE             10  /* -                                 */
--#define VCHIQ_MSG_RESUME            11  /* -                                 */
--#define VCHIQ_MSG_REMOTE_USE        12  /* -                                 */
--#define VCHIQ_MSG_REMOTE_RELEASE    13  /* -                                 */
--#define VCHIQ_MSG_REMOTE_USE_ACTIVE 14  /* -                                 */
-+#define VCHIQ_MSG_PADDING              0  // -
-+#define VCHIQ_MSG_CONNECT              1  // -
-+#define VCHIQ_MSG_OPEN                 2  // + (srcport, -), fourcc, client_id
-+#define VCHIQ_MSG_OPENACK              3  // + (srcport, dstport)
-+#define VCHIQ_MSG_CLOSE                4  // + (srcport, dstport)
-+#define VCHIQ_MSG_DATA                 5  // + (srcport, dstport)
-+#define VCHIQ_MSG_BULK_RX              6  // + (srcport, dstport), data, size
-+#define VCHIQ_MSG_BULK_TX              7  // + (srcport, dstport), data, size
-+#define VCHIQ_MSG_BULK_RX_DONE         8  // + (srcport, dstport), actual
-+#define VCHIQ_MSG_BULK_TX_DONE         9  // + (srcport, dstport), actual
-+#define VCHIQ_MSG_PAUSE               10  // -
-+#define VCHIQ_MSG_RESUME              11  // -
-+#define VCHIQ_MSG_REMOTE_USE          12  // -
-+#define VCHIQ_MSG_REMOTE_RELEASE      13  // -
-+#define VCHIQ_MSG_REMOTE_USE_ACTIVE   14  // -
- 
- #define VCHIQ_PORT_MAX                 (VCHIQ_MAX_SERVICES - 1)
- #define VCHIQ_PORT_FREE                0x1000
- #define VCHIQ_PORT_IS_VALID(port)      (port < VCHIQ_PORT_FREE)
--#define VCHIQ_MAKE_MSG(type, srcport, dstport) \
--	((type<<24) | (srcport<<12) | (dstport<<0))
-+#define VCHIQ_MAKE_MSG(type,srcport,dstport)      ((type<<24) | (srcport<<12) | (dstport<<0))
- #define VCHIQ_MSG_TYPE(msgid)          ((unsigned int)msgid >> 24)
--#define VCHIQ_MSG_SRCPORT(msgid) \
--	(unsigned short)(((unsigned int)msgid >> 12) & 0xfff)
--#define VCHIQ_MSG_DSTPORT(msgid) \
--	((unsigned short)msgid & 0xfff)
-+#define VCHIQ_MSG_SRCPORT(msgid)       (unsigned short)(((unsigned int)msgid >> 12) & 0xfff)
-+#define VCHIQ_MSG_DSTPORT(msgid)       ((unsigned short)msgid & 0xfff)
- 
- #define VCHIQ_FOURCC_AS_4CHARS(fourcc)	\
--	((fourcc) >> 24) & 0xff, \
--	((fourcc) >> 16) & 0xff, \
--	((fourcc) >>  8) & 0xff, \
--	(fourcc) & 0xff
-+   ((fourcc) >> 24) & 0xff, \
-+   ((fourcc) >> 16) & 0xff, \
-+   ((fourcc) >>  8) & 0xff, \
-+   ((fourcc)      ) & 0xff
- 
- /* Ensure the fields are wide enough */
--vchiq_static_assert(VCHIQ_MSG_SRCPORT(VCHIQ_MAKE_MSG(0, 0, VCHIQ_PORT_MAX))
--	== 0);
--vchiq_static_assert(VCHIQ_MSG_TYPE(VCHIQ_MAKE_MSG(0, VCHIQ_PORT_MAX, 0)) == 0);
--vchiq_static_assert((unsigned int)VCHIQ_PORT_MAX <
--	(unsigned int)VCHIQ_PORT_FREE);
-+vcos_static_assert(VCHIQ_MSG_SRCPORT(VCHIQ_MAKE_MSG(0,0,VCHIQ_PORT_MAX)) == 0);
-+vcos_static_assert(VCHIQ_MSG_TYPE(VCHIQ_MAKE_MSG(0,VCHIQ_PORT_MAX,0)) == 0);
-+vcos_static_assert((unsigned int)VCHIQ_PORT_MAX < (unsigned int)VCHIQ_PORT_FREE);
- 
--#define VCHIQ_MSGID_PADDING            VCHIQ_MAKE_MSG(VCHIQ_MSG_PADDING, 0, 0)
-+#define VCHIQ_MSGID_PADDING            VCHIQ_MAKE_MSG(VCHIQ_MSG_PADDING,0,0)
- #define VCHIQ_MSGID_CLAIMED            0x40000000
- 
- #define VCHIQ_FOURCC_INVALID           0x00000000
-@@ -127,7 +80,7 @@
- 
- typedef uint32_t BITSET_T;
- 
--vchiq_static_assert((sizeof(BITSET_T) * 8) == 32);
-+vcos_static_assert((sizeof(BITSET_T) * 8) == 32);
- 
- #define BITSET_SIZE(b)        ((b + 31) >> 5)
- #define BITSET_WORD(b)        (b >> 5)
-@@ -138,380 +91,314 @@
- #define BITSET_CLR(bs, b)     (bs[BITSET_WORD(b)] &= ~BITSET_BIT(b))
- 
- #if VCHIQ_ENABLE_STATS
--#define VCHIQ_STATS_INC(state, stat) (state->stats. stat++)
--#define VCHIQ_SERVICE_STATS_INC(service, stat) (service->stats. stat++)
--#define VCHIQ_SERVICE_STATS_ADD(service, stat, addend) \
--	(service->stats. stat += addend)
-+#define VCHIQ_STATS_INC(state, stat) (state->stats. stat ++)
-+#define VCHIQ_SERVICE_STATS_INC(service, stat) (service->stats. stat ++)
-+#define VCHIQ_SERVICE_STATS_ADD(service, stat, addend) (service->stats. stat += addend)
- #else
- #define VCHIQ_STATS_INC(state, stat) ((void)0)
- #define VCHIQ_SERVICE_STATS_INC(service, stat) ((void)0)
- #define VCHIQ_SERVICE_STATS_ADD(service, stat, addend) ((void)0)
- #endif
- 
--enum {
--	DEBUG_ENTRIES,
-+enum
-+{
-+   DEBUG_ENTRIES,
- #if VCHIQ_ENABLE_DEBUG
--	DEBUG_SLOT_HANDLER_COUNT,
--	DEBUG_SLOT_HANDLER_LINE,
--	DEBUG_PARSE_LINE,
--	DEBUG_PARSE_HEADER,
--	DEBUG_PARSE_MSGID,
--	DEBUG_AWAIT_COMPLETION_LINE,
--	DEBUG_DEQUEUE_MESSAGE_LINE,
--	DEBUG_SERVICE_CALLBACK_LINE,
--	DEBUG_MSG_QUEUE_FULL_COUNT,
--	DEBUG_COMPLETION_QUEUE_FULL_COUNT,
-+   DEBUG_SLOT_HANDLER_COUNT,
-+   DEBUG_SLOT_HANDLER_LINE,
-+   DEBUG_PARSE_LINE,
-+   DEBUG_PARSE_HEADER,
-+   DEBUG_PARSE_MSGID,
-+   DEBUG_AWAIT_COMPLETION_LINE,
-+   DEBUG_DEQUEUE_MESSAGE_LINE,
-+   DEBUG_SERVICE_CALLBACK_LINE,
-+   DEBUG_MSG_QUEUE_FULL_COUNT,
-+   DEBUG_COMPLETION_QUEUE_FULL_COUNT,
- #endif
--	DEBUG_MAX
-+   DEBUG_MAX
- };
- 
- #if VCHIQ_ENABLE_DEBUG
- 
--#define DEBUG_INITIALISE(local) int *debug_ptr = (local)->debug;
--#define DEBUG_TRACE(d) \
--	do { debug_ptr[DEBUG_ ## d] = __LINE__; dsb(); } while (0)
--#define DEBUG_VALUE(d, v) \
--	do { debug_ptr[DEBUG_ ## d] = (v); dsb(); } while (0)
--#define DEBUG_COUNT(d) \
--	do { debug_ptr[DEBUG_ ## d]++; dsb(); } while (0)
-+#define DEBUG_INITIALISE(local) volatile int *debug_ptr = (local)->debug;
-+#define DEBUG_TRACE(d) debug_ptr[DEBUG_ ## d] = __LINE__
-+#define DEBUG_VALUE(d,v) debug_ptr[DEBUG_ ## d] = (v)
-+#define DEBUG_COUNT(d) debug_ptr[DEBUG_ ## d]++
- 
- #else /* VCHIQ_ENABLE_DEBUG */
- 
- #define DEBUG_INITIALISE(local)
- #define DEBUG_TRACE(d)
--#define DEBUG_VALUE(d, v)
-+#define DEBUG_VALUE(d,v)
- #define DEBUG_COUNT(d)
- 
- #endif /* VCHIQ_ENABLE_DEBUG */
- 
--typedef enum {
--	VCHIQ_CONNSTATE_DISCONNECTED,
--	VCHIQ_CONNSTATE_CONNECTING,
--	VCHIQ_CONNSTATE_CONNECTED,
--	VCHIQ_CONNSTATE_PAUSING,
--	VCHIQ_CONNSTATE_PAUSE_SENT,
--	VCHIQ_CONNSTATE_PAUSED,
--	VCHIQ_CONNSTATE_RESUMING
-+typedef enum
-+{
-+   VCHIQ_CONNSTATE_DISCONNECTED,
-+   VCHIQ_CONNSTATE_CONNECTED,
-+   VCHIQ_CONNSTATE_PAUSING,
-+   VCHIQ_CONNSTATE_PAUSE_SENT,
-+   VCHIQ_CONNSTATE_PAUSED,
-+   VCHIQ_CONNSTATE_RESUMING
- } VCHIQ_CONNSTATE_T;
- 
--enum {
--	VCHIQ_SRVSTATE_FREE,
--	VCHIQ_SRVSTATE_HIDDEN,
--	VCHIQ_SRVSTATE_LISTENING,
--	VCHIQ_SRVSTATE_OPENING,
--	VCHIQ_SRVSTATE_OPEN,
--	VCHIQ_SRVSTATE_OPENSYNC,
--	VCHIQ_SRVSTATE_CLOSESENT,
--	VCHIQ_SRVSTATE_CLOSERECVD,
--	VCHIQ_SRVSTATE_CLOSEWAIT,
--	VCHIQ_SRVSTATE_CLOSED
-+enum
-+{
-+   VCHIQ_SRVSTATE_FREE,
-+   VCHIQ_SRVSTATE_HIDDEN,
-+   VCHIQ_SRVSTATE_LISTENING,
-+   VCHIQ_SRVSTATE_OPENING,
-+   VCHIQ_SRVSTATE_OPEN,
-+   VCHIQ_SRVSTATE_CLOSESENT,
-+   VCHIQ_SRVSTATE_CLOSING,
-+   VCHIQ_SRVSTATE_CLOSEWAIT
- };
- 
--enum {
--	VCHIQ_POLL_TERMINATE,
--	VCHIQ_POLL_TXNOTIFY,
--	VCHIQ_POLL_RXNOTIFY,
--	VCHIQ_POLL_COUNT
-+enum
-+{
-+   VCHIQ_POLL_TERMINATE,
-+   VCHIQ_POLL_TXNOTIFY,
-+   VCHIQ_POLL_RXNOTIFY,
-+   VCHIQ_POLL_COUNT
- };
- 
--typedef enum {
--	VCHIQ_BULK_TRANSMIT,
--	VCHIQ_BULK_RECEIVE
-+typedef enum
-+{
-+   VCHIQ_BULK_TRANSMIT,
-+   VCHIQ_BULK_RECEIVE
- } VCHIQ_BULK_DIR_T;
- 
- typedef struct vchiq_bulk_struct {
--	short mode;
--	short dir;
--	void *userdata;
--	VCHI_MEM_HANDLE_T handle;
--	void *data;
--	int size;
--	void *remote_data;
--	int remote_size;
--	int actual;
-+   short mode;
-+   short dir;
-+   void *userdata;
-+   VCHI_MEM_HANDLE_T handle;
-+   void *data;
-+   int size;
-+   void *remote_data;
-+   int remote_size;
-+   int actual;
- } VCHIQ_BULK_T;
- 
- typedef struct vchiq_bulk_queue_struct {
--	int local_insert;  /* Where to insert the next local bulk */
--	int remote_insert; /* Where to insert the next remote bulk (master) */
--	int process;       /* Bulk to transfer next */
--	int remote_notify; /* Bulk to notify the remote client of next (mstr) */
--	int remove;        /* Bulk to notify the local client of, and remove,
--			   ** next */
--	VCHIQ_BULK_T bulks[VCHIQ_NUM_SERVICE_BULKS];
-+   int local_insert;  /* Where to insert the next local bulk */
-+   int remote_insert; /* Where to insert the next remote bulk (master) */
-+   int process;       /* Bulk to transfer next */
-+   int remote_notify; /* Bulk to notify the remote client of next (master) */
-+   int remove;        /* Bulk to notify the local client of, and remove, next */
-+   VCHIQ_BULK_T bulks[VCHIQ_NUM_SERVICE_BULKS];
- } VCHIQ_BULK_QUEUE_T;
- 
- typedef struct remote_event_struct {
--	int armed;
--	int fired;
--	struct semaphore *event;
-+   volatile int armed;
-+   volatile int fired;
-+   VCOS_EVENT_T * event;
- } REMOTE_EVENT_T;
- 
--typedef struct opaque_platform_state_t *VCHIQ_PLATFORM_STATE_T;
-+typedef struct opaque_platform_state_t* VCHIQ_PLATFORM_STATE_T;
- 
- typedef struct vchiq_state_struct VCHIQ_STATE_T;
- 
- typedef struct vchiq_slot_struct {
--	char data[VCHIQ_SLOT_SIZE];
-+   char data[VCHIQ_SLOT_SIZE];
- } VCHIQ_SLOT_T;
- 
- typedef struct vchiq_slot_info_struct {
--	/* Use two counters rather than one to avoid the need for a mutex. */
--	short use_count;
--	short release_count;
-+   /* Use two counters rather than one to avoid the need for a mutex. */
-+   volatile short use_count;
-+   volatile short release_count;
- } VCHIQ_SLOT_INFO_T;
- 
- typedef struct vchiq_service_struct {
--	VCHIQ_SERVICE_BASE_T base;
--	VCHIQ_SERVICE_HANDLE_T handle;
--	unsigned int ref_count;
--	int srvstate;
--	unsigned int localport;
--	unsigned int remoteport;
--	int public_fourcc;
--	int client_id;
--	char auto_close;
--	char sync;
--	char closing;
--	atomic_t poll_flags;
--	short version;
--	short version_min;
--
--	VCHIQ_STATE_T *state;
--	VCHIQ_INSTANCE_T instance;
--
--	int service_use_count;
--
--	VCHIQ_BULK_QUEUE_T bulk_tx;
--	VCHIQ_BULK_QUEUE_T bulk_rx;
--
--	struct semaphore remove_event;
--	struct semaphore bulk_remove_event;
--	struct mutex bulk_mutex;
--
--	struct service_stats_struct {
--		int quota_stalls;
--		int slot_stalls;
--		int bulk_stalls;
--		int error_count;
--		int ctrl_tx_count;
--		int ctrl_rx_count;
--		int bulk_tx_count;
--		int bulk_rx_count;
--		int bulk_aborted_count;
--		uint64_t ctrl_tx_bytes;
--		uint64_t ctrl_rx_bytes;
--		uint64_t bulk_tx_bytes;
--		uint64_t bulk_rx_bytes;
--	} stats;
-+   VCHIQ_SERVICE_BASE_T base;
-+   volatile int srvstate;
-+   unsigned int localport;
-+   unsigned int remoteport;
-+   int public_fourcc;
-+   int client_id;
-+   int auto_close;
-+   VCOS_ATOMIC_FLAGS_T poll_flags;
-+   short version;
-+   short version_min;
-+
-+   VCHIQ_STATE_T *state;
-+   VCHIQ_INSTANCE_T instance;
-+
-+   int service_use_count;
-+
-+   VCHIQ_BULK_QUEUE_T bulk_tx;
-+   VCHIQ_BULK_QUEUE_T bulk_rx;
-+
-+   VCOS_EVENT_T remove_event;
-+   VCOS_EVENT_T bulk_remove_event;
-+   VCOS_MUTEX_T bulk_mutex;
-+
-+   struct service_stats_struct
-+   {
-+      int quota_stalls;
-+      int slot_stalls;
-+      int bulk_stalls;
-+      int error_count;
-+      int ctrl_tx_count;
-+      int ctrl_rx_count;
-+      int bulk_tx_count;
-+      int bulk_rx_count;
-+      int bulk_aborted_count;
-+      uint64_t ctrl_tx_bytes;
-+      uint64_t ctrl_rx_bytes;
-+      uint64_t bulk_tx_bytes;
-+      uint64_t bulk_rx_bytes;
-+   } stats;
- } VCHIQ_SERVICE_T;
- 
- /* The quota information is outside VCHIQ_SERVICE_T so that it can be
--	statically allocated, since for accounting reasons a service's slot
--	usage is carried over between users of the same port number.
-+   statically allocated, since for accounting reasons a service's slot
-+   usage is carried over between users of the same port number.
-  */
- typedef struct vchiq_service_quota_struct {
--	unsigned short slot_quota;
--	unsigned short slot_use_count;
--	unsigned short message_quota;
--	unsigned short message_use_count;
--	struct semaphore quota_event;
--	int previous_tx_index;
-+   unsigned short slot_quota;
-+   unsigned short slot_use_count;
-+   unsigned short message_quota;
-+   unsigned short message_use_count;
-+   VCOS_EVENT_T quota_event;
-+   int previous_tx_index;
- } VCHIQ_SERVICE_QUOTA_T;
- 
- typedef struct vchiq_shared_state_struct {
- 
--	/* A non-zero value here indicates that the content is valid. */
--	int initialised;
--
--	/* The first and last (inclusive) slots allocated to the owner. */
--	int slot_first;
--	int slot_last;
--
--	/* The slot allocated to synchronous messages from the owner. */
--	int slot_sync;
--
--	/* Signalling this event indicates that owner's slot handler thread
--	** should run. */
--	REMOTE_EVENT_T trigger;
-+   /* A non-zero value here indicates that the content is valid. */
-+   int initialised;
- 
--	/* Indicates the byte position within the stream where the next message
--	** will be written. The least significant bits are an index into the
--	** slot. The next bits are the index of the slot in slot_queue. */
--	int tx_pos;
-+   /* The first and last (inclusive) slots allocated to the owner. */
-+   int slot_first;
-+   int slot_last;
- 
--	/* This event should be signalled when a slot is recycled. */
--	REMOTE_EVENT_T recycle;
-+   /* Signalling this event indicates that owner's slot handler thread should
-+      run. */
-+   REMOTE_EVENT_T trigger;
- 
--	/* The slot_queue index where the next recycled slot will be written. */
--	int slot_queue_recycle;
-+   /* Indicates the byte position within the stream where the next message
-+      will be written. The least significant bits are an index into the slot.
-+      The next bits are the index of the slot in slot_queue. */
-+   volatile int tx_pos;
- 
--	/* This event should be signalled when a synchronous message is sent. */
--	REMOTE_EVENT_T sync_trigger;
-+   /* This event should be signalled when a slot is recycled. */
-+   REMOTE_EVENT_T recycle;
- 
--	/* This event should be signalled when a synchronous message has been
--	** released. */
--	REMOTE_EVENT_T sync_release;
-+   /* The slot_queue index where the next recycled slot will be written. */
-+   volatile int slot_queue_recycle;
- 
--	/* A circular buffer of slot indexes. */
--	int slot_queue[VCHIQ_MAX_SLOTS_PER_SIDE];
-+   /* A circular buffer of slot indexes. */
-+   int slot_queue[VCHIQ_MAX_SLOTS_PER_SIDE];
- 
--	/* Debugging state */
--	int debug[DEBUG_MAX];
-+   /* Debugging state */
-+   volatile int debug[DEBUG_MAX];
- } VCHIQ_SHARED_STATE_T;
- 
- typedef struct vchiq_slot_zero_struct {
--	int magic;
--	short version;
--	short version_min;
--	int slot_zero_size;
--	int slot_size;
--	int max_slots;
--	int max_slots_per_side;
--	int platform_data[2];
--	VCHIQ_SHARED_STATE_T master;
--	VCHIQ_SHARED_STATE_T slave;
--	VCHIQ_SLOT_INFO_T slots[VCHIQ_MAX_SLOTS];
-+   int magic;
-+   short version;
-+   short version_min;
-+   int slot_zero_size;
-+   int slot_size;
-+   int max_slots;
-+   int max_slots_per_side;
-+   int platform_data[2];
-+   VCHIQ_SHARED_STATE_T master;
-+   VCHIQ_SHARED_STATE_T slave;
-+   VCHIQ_SLOT_INFO_T slots[VCHIQ_MAX_SLOTS];
- } VCHIQ_SLOT_ZERO_T;
- 
- struct vchiq_state_struct {
--	int id;
--	int initialised;
--	VCHIQ_CONNSTATE_T conn_state;
--	int is_master;
-+   int id;
-+   int initialised;
-+   VCHIQ_CONNSTATE_T conn_state;
-+   int is_master;
- 
--	VCHIQ_SHARED_STATE_T *local;
--	VCHIQ_SHARED_STATE_T *remote;
--	VCHIQ_SLOT_T *slot_data;
-+   VCHIQ_SHARED_STATE_T *local;
-+   VCHIQ_SHARED_STATE_T *remote;
-+   VCHIQ_SLOT_T *slot_data;
- 
--	unsigned short default_slot_quota;
--	unsigned short default_message_quota;
-+   unsigned short default_slot_quota;
-+   unsigned short default_message_quota;
- 
--	/* Event indicating connect message received */
--	struct semaphore connect;
-+   VCOS_EVENT_T connect;      // event indicating connect message received
-+   VCOS_MUTEX_T mutex;        // mutex protecting services
-+   VCHIQ_INSTANCE_T *instance;
- 
--	/* Mutex protecting services */
--	struct mutex mutex;
--	VCHIQ_INSTANCE_T *instance;
-+   VCOS_THREAD_T slot_handler_thread;  // processes incoming messages
-+   VCOS_THREAD_T recycle_thread;       // processes recycled slots
- 
--	/* Processes incoming messages */
--	struct task_struct *slot_handler_thread;
-+   /* Local implementation of the trigger remote event */
-+   VCOS_EVENT_T trigger_event;
- 
--	/* Processes recycled slots */
--	struct task_struct *recycle_thread;
-+   /* Local implementation of the recycle remote event */
-+   VCOS_EVENT_T recycle_event;
- 
--	/* Processes synchronous messages */
--	struct task_struct *sync_thread;
-+   char *tx_data;
-+   char *rx_data;
-+   VCHIQ_SLOT_INFO_T *rx_info;
- 
--	/* Local implementation of the trigger remote event */
--	struct semaphore trigger_event;
-+   VCOS_MUTEX_T slot_mutex;
- 
--	/* Local implementation of the recycle remote event */
--	struct semaphore recycle_event;
-+   VCOS_MUTEX_T recycle_mutex;
- 
--	/* Local implementation of the sync trigger remote event */
--	struct semaphore sync_trigger_event;
-+   /* Indicates the byte position within the stream from where the next message
-+      will be read. The least significant bits are an index into the slot.
-+      The next bits are the index of the slot in remote->slot_queue. */
-+   int rx_pos;
- 
--	/* Local implementation of the sync release remote event */
--	struct semaphore sync_release_event;
-+   /* A cached copy of local->tx_pos. Only write to local->tx_pos, and read
-+      from remote->tx_pos. */
-+   int local_tx_pos;
- 
--	char *tx_data;
--	char *rx_data;
--	VCHIQ_SLOT_INFO_T *rx_info;
-+   /* The slot_queue index of the slot to become available next. */
-+   int slot_queue_available;
- 
--	struct mutex slot_mutex;
-+   /* A flag to indicate if any poll has been requested */
-+   int poll_needed;
- 
--	struct mutex recycle_mutex;
-+   /* An array of bit sets indicating which services must be polled. */
-+   VCOS_ATOMIC_FLAGS_T poll_services[BITSET_SIZE(VCHIQ_MAX_SERVICES)];
- 
--	struct mutex sync_mutex;
-+   /* The number of the first unused service */
-+   int unused_service;
- 
--	struct mutex bulk_transfer_mutex;
-+   /* Signalled when a free slot becomes available. */
-+   VCOS_EVENT_T slot_available_event;
- 
--	/* Indicates the byte position within the stream from where the next
--	** message will be read. The least significant bits are an index into
--	** the slot.The next bits are the index of the slot in
--	** remote->slot_queue. */
--	int rx_pos;
-+   VCOS_EVENT_T slot_remove_event;
- 
--	/* A cached copy of local->tx_pos. Only write to local->tx_pos, and read
--		from remote->tx_pos. */
--	int local_tx_pos;
-+   struct state_stats_struct
-+   {
-+      int slot_stalls;
-+      int ctrl_tx_count;
-+      int ctrl_rx_count;
-+      int error_count;
-+   } stats;
- 
--	/* The slot_queue index of the slot to become available next. */
--	int slot_queue_available;
-+   VCHIQ_SERVICE_T *services[VCHIQ_MAX_SERVICES];
-+   VCHIQ_SERVICE_QUOTA_T service_quotas[VCHIQ_MAX_SERVICES];
-+   VCHIQ_SLOT_INFO_T slot_info[VCHIQ_MAX_SLOTS];
- 
--	/* A flag to indicate if any poll has been requested */
--	int poll_needed;
--
--	/* Ths index of the previous slot used for data messages. */
--	int previous_data_index;
--
--	/* The number of slots occupied by data messages. */
--	unsigned short data_use_count;
--
--	/* The maximum number of slots to be occupied by data messages. */
--	unsigned short data_quota;
--
--	/* An array of bit sets indicating which services must be polled. */
--	atomic_t poll_services[BITSET_SIZE(VCHIQ_MAX_SERVICES)];
--
--	/* The number of the first unused service */
--	int unused_service;
--
--	/* Signalled when a free slot becomes available. */
--	struct semaphore slot_available_event;
--
--	struct semaphore slot_remove_event;
--
--	/* Signalled when a free data slot becomes available. */
--	struct semaphore data_quota_event;
--
--	struct state_stats_struct {
--		int slot_stalls;
--		int data_stalls;
--		int ctrl_tx_count;
--		int ctrl_rx_count;
--		int error_count;
--	} stats;
--
--	VCHIQ_SERVICE_T * services[VCHIQ_MAX_SERVICES];
--	VCHIQ_SERVICE_QUOTA_T service_quotas[VCHIQ_MAX_SERVICES];
--	VCHIQ_SLOT_INFO_T slot_info[VCHIQ_MAX_SLOTS];
--
--	VCHIQ_PLATFORM_STATE_T platform_state;
--};
--
--struct bulk_waiter {
--	VCHIQ_BULK_T *bulk;
--	struct semaphore event;
--	int actual;
-+   VCHIQ_PLATFORM_STATE_T platform_state;
- };
- 
--extern spinlock_t bulk_waiter_spinlock;
--
--extern int vchiq_core_log_level;
--extern int vchiq_core_msg_log_level;
--extern int vchiq_sync_log_level;
--
--extern VCHIQ_STATE_T *vchiq_states[VCHIQ_MAX_STATES];
--
--extern const char *
--get_conn_state_name(VCHIQ_CONNSTATE_T conn_state);
--
- extern VCHIQ_SLOT_ZERO_T *
- vchiq_init_slots(void *mem_base, int mem_size);
- 
- extern VCHIQ_STATUS_T
--vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
--	int is_master);
-+vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero, int is_master);
- 
- extern VCHIQ_STATUS_T
- vchiq_connect_internal(VCHIQ_STATE_T *state, VCHIQ_INSTANCE_T instance);
- 
- extern VCHIQ_SERVICE_T *
- vchiq_add_service_internal(VCHIQ_STATE_T *state,
--	const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,
--	VCHIQ_INSTANCE_T instance);
-+   const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,
-+   VCHIQ_INSTANCE_T instance);
- 
- extern VCHIQ_STATUS_T
- vchiq_open_service_internal(VCHIQ_SERVICE_T *service, int client_id);
-@@ -538,9 +425,9 @@
- remote_event_pollall(VCHIQ_STATE_T *state);
- 
- extern VCHIQ_STATUS_T
--vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
--	VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata,
--	VCHIQ_BULK_MODE_T mode, VCHIQ_BULK_DIR_T dir);
-+vchiq_bulk_transfer(VCHIQ_SERVICE_T *service,
-+   VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata,
-+   VCHIQ_BULK_MODE_T mode, VCHIQ_BULK_DIR_T dir);
- 
- extern void
- vchiq_dump_state(void *dump_context, VCHIQ_STATE_T *state);
-@@ -548,52 +435,12 @@
- extern void
- vchiq_dump_service_state(void *dump_context, VCHIQ_SERVICE_T *service);
- 
--extern void
--vchiq_loud_error_header(void);
--
--extern void
--vchiq_loud_error_footer(void);
--
--extern void
--request_poll(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service, int poll_type);
--
--static inline VCHIQ_SERVICE_T *
--handle_to_service(VCHIQ_SERVICE_HANDLE_T handle)
--{
--	VCHIQ_STATE_T *state = vchiq_states[(handle / VCHIQ_MAX_SERVICES) &
--		(VCHIQ_MAX_STATES - 1)];
--	if (!state)
--		return NULL;
--
--	return state->services[handle & (VCHIQ_MAX_SERVICES - 1)];
--}
--
--extern VCHIQ_SERVICE_T *
--find_service_by_handle(VCHIQ_SERVICE_HANDLE_T handle);
--
--extern VCHIQ_SERVICE_T *
--find_service_by_port(VCHIQ_STATE_T *state, int localport);
--
--extern VCHIQ_SERVICE_T *
--find_service_for_instance(VCHIQ_INSTANCE_T instance,
--	VCHIQ_SERVICE_HANDLE_T handle);
--
--extern VCHIQ_SERVICE_T *
--next_service_by_instance(VCHIQ_STATE_T *state, VCHIQ_INSTANCE_T instance,
--	int *pidx);
--
--extern void
--lock_service(VCHIQ_SERVICE_T *service);
--
--extern void
--unlock_service(VCHIQ_SERVICE_T *service);
--
- /* The following functions are called from vchiq_core, and external
--** implementations must be provided. */
-+   implementations must be provided. */
- 
- extern VCHIQ_STATUS_T
- vchiq_prepare_bulk_data(VCHIQ_BULK_T *bulk,
--	VCHI_MEM_HANDLE_T memhandle, void *offset, int size, int dir);
-+   VCHI_MEM_HANDLE_T memhandle, void *offset, int size, int dir);
- 
- extern void
- vchiq_transfer_bulk(VCHIQ_BULK_T *bulk);
-@@ -607,15 +454,9 @@
- extern void
- remote_event_signal(REMOTE_EVENT_T *event);
- 
--void
--vchiq_platform_check_suspend(VCHIQ_STATE_T *state);
--
- extern void
- vchiq_platform_paused(VCHIQ_STATE_T *state);
- 
--extern VCHIQ_STATUS_T
--vchiq_platform_resume(VCHIQ_STATE_T *state);
--
- extern void
- vchiq_platform_resumed(VCHIQ_STATE_T *state);
- 
-@@ -630,7 +471,7 @@
- 
- extern void
- vchiq_dump_platform_service_state(void *dump_context,
--	VCHIQ_SERVICE_T *service);
-+   VCHIQ_SERVICE_T *service);
- 
- extern VCHIQ_STATUS_T
- vchiq_use_service_internal(VCHIQ_SERVICE_T *service);
-@@ -638,36 +479,28 @@
- extern VCHIQ_STATUS_T
- vchiq_release_service_internal(VCHIQ_SERVICE_T *service);
- 
--extern void
-+extern VCHIQ_STATUS_T
- vchiq_on_remote_use(VCHIQ_STATE_T *state);
- 
--extern void
-+extern VCHIQ_STATUS_T
- vchiq_on_remote_release(VCHIQ_STATE_T *state);
- 
- extern VCHIQ_STATUS_T
- vchiq_platform_init_state(VCHIQ_STATE_T *state);
- 
--extern VCHIQ_STATUS_T
--vchiq_check_service(VCHIQ_SERVICE_T *service);
--
- extern void
- vchiq_on_remote_use_active(VCHIQ_STATE_T *state);
- 
- extern VCHIQ_STATUS_T
--vchiq_send_remote_use(VCHIQ_STATE_T *state);
-+vchiq_send_remote_use(VCHIQ_STATE_T * state);
- 
- extern VCHIQ_STATUS_T
--vchiq_send_remote_release(VCHIQ_STATE_T *state);
-+vchiq_send_remote_release(VCHIQ_STATE_T * state);
- 
- extern VCHIQ_STATUS_T
--vchiq_send_remote_use_active(VCHIQ_STATE_T *state);
--
--extern void
--vchiq_platform_conn_state_changed(VCHIQ_STATE_T *state,
--	VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate);
-+vchiq_send_remote_use_active(VCHIQ_STATE_T * state);
- 
- extern void
--vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
--	size_t numBytes);
-+vchiq_platform_conn_state_changed(VCHIQ_STATE_T* state, VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate);
- 
- #endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion	2012-10-21 15:15:10.015260026 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion	1970-01-01 01:00:00.000000000 +0100
-@@ -1,87 +0,0 @@
--#!/usr/bin/perl -w
--
--use strict;
--
--#
--# Generate a version from available information
--#
--
--my $prefix = shift @ARGV;
--my $root = shift @ARGV;
--
--
--if ( not defined $root ) {
--	die "usage: $0 prefix root-dir\n";
--}
--
--if ( ! -d $root ) {
--	die "root directory $root not found\n";
--}
--
--my $version = "unknown";
--my $tainted = "";
--
--if ( -d "$root/.git" ) {
--	# attempt to work out git version. only do so
--	# on a linux build host, as cygwin builds are
--	# already slow enough
--
--	if ( -f "/usr/bin/git" || -f "/usr/local/bin/git" ) {
--		if (not open(F, "git --git-dir $root/.git rev-parse --verify HEAD|")) {
--			$version = "no git version";
--		}
--		else {
--			$version = <F>;
--			$version =~ s/[ \r\n]*$//;     # chomp may not be enough (cygwin).
--			$version =~ s/^[ \r\n]*//;     # chomp may not be enough (cygwin).
--		}
--
--		if (open(G, "git --git-dir $root/.git status --porcelain|")) {
--			$tainted = <G>;
--			$tainted =~ s/[ \r\n]*$//;     # chomp may not be enough (cygwin).
--			$tainted =~ s/^[ \r\n]*//;     # chomp may not be enough (cygwin).
--			if (length $tainted) {
--			$version = join ' ', $version, "(tainted)";
--		}
--		else {
--			$version = join ' ', $version, "(clean)";
--         }
--		}
--	}
--}
--
--my $hostname = `hostname`;
--$hostname =~ s/[ \r\n]*$//;     # chomp may not be enough (cygwin).
--$hostname =~ s/^[ \r\n]*//;     # chomp may not be enough (cygwin).
--
--
--print STDERR "Version $version\n";
--print <<EOF;
--#include "${prefix}_build_info.h"
--#include <linux/broadcom/vc_debug_sym.h>
--
--VC_DEBUG_DECLARE_STRING_VAR( ${prefix}_build_hostname, "$hostname" );
--VC_DEBUG_DECLARE_STRING_VAR( ${prefix}_build_version, "$version" );
--VC_DEBUG_DECLARE_STRING_VAR( ${prefix}_build_time,    __TIME__ );
--VC_DEBUG_DECLARE_STRING_VAR( ${prefix}_build_date,    __DATE__ );
--
--const char *vchiq_get_build_hostname( void )
--{
--   return vchiq_build_hostname;
--}
--
--const char *vchiq_get_build_version( void )
--{
--   return vchiq_build_version;
--}
--
--const char *vchiq_get_build_date( void )
--{
--   return vchiq_build_date;
--}
--
--const char *vchiq_get_build_time( void )
--{
--   return vchiq_build_time;
--}
--EOF
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h	2012-10-21 15:15:10.002259772 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h	2012-10-17 18:57:47.000000000 +0200
-@@ -21,6 +21,7 @@
- 
- #include "vchiq_if.h"
- #include "vchiq_util.h"
-+#include "interface/vcos/vcos.h"
- 
- #endif
- 
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h	2012-10-21 15:15:10.016260046 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h	2012-10-17 18:57:47.000000000 +0200
-@@ -21,145 +21,135 @@
- 
- #include "interface/vchi/vchi_mh.h"
- 
--#define VCHIQ_SERVICE_HANDLE_INVALID 0
--
--#define VCHIQ_SLOT_SIZE     4096
--#define VCHIQ_MAX_MSG_SIZE  (VCHIQ_SLOT_SIZE - sizeof(VCHIQ_HEADER_T))
--#define VCHIQ_CHANNEL_SIZE  VCHIQ_MAX_MSG_SIZE /* For backwards compatibility */
--
--#define VCHIQ_MAKE_FOURCC(x0, x1, x2, x3) \
--			(((x0) << 24) | ((x1) << 16) | ((x2) << 8) | (x3))
--#define VCHIQ_GET_SERVICE_USERDATA(service) vchiq_get_service_userdata(service)
--#define VCHIQ_GET_SERVICE_FOURCC(service)   vchiq_get_service_fourcc(service)
-+#define VCHIQ_SLOT_SIZE          4096
-+#define VCHIQ_MAX_MSG_SIZE       (VCHIQ_SLOT_SIZE - sizeof(VCHIQ_HEADER_T))
-+#define VCHIQ_CHANNEL_SIZE       VCHIQ_MAX_MSG_SIZE /* For backwards compatibility */
-+
-+#define VCHIQ_MAKE_FOURCC(x0, x1, x2, x3)     (((x0) << 24) | ((x1) << 16) | ((x2) << 8) | (x3))
-+#define VCHIQ_GET_SERVICE_USERDATA(service)   (service->userdata)
-+#define VCHIQ_GET_SERVICE_FOURCC(service)     (service->fourcc)
- 
- typedef enum {
--	VCHIQ_SERVICE_OPENED,         /* service, -, -             */
--	VCHIQ_SERVICE_CLOSED,         /* service, -, -             */
--	VCHIQ_MESSAGE_AVAILABLE,      /* service, header, -        */
--	VCHIQ_BULK_TRANSMIT_DONE,     /* service, -, bulk_userdata */
--	VCHIQ_BULK_RECEIVE_DONE,      /* service, -, bulk_userdata */
--	VCHIQ_BULK_TRANSMIT_ABORTED,  /* service, -, bulk_userdata */
--	VCHIQ_BULK_RECEIVE_ABORTED    /* service, -, bulk_userdata */
-+   VCHIQ_SERVICE_OPENED,         // service, -, -
-+   VCHIQ_SERVICE_CLOSED,         // service, -, -
-+   VCHIQ_MESSAGE_AVAILABLE,      // service, header, -
-+   VCHIQ_BULK_TRANSMIT_DONE,     // service, -, bulk_userdata
-+   VCHIQ_BULK_RECEIVE_DONE,      // service, -, bulk_userdata
-+   VCHIQ_BULK_TRANSMIT_ABORTED,  // service, -, bulk_userdata
-+   VCHIQ_BULK_RECEIVE_ABORTED    // service, -, bulk_userdata
- } VCHIQ_REASON_T;
- 
--typedef enum {
--	VCHIQ_ERROR   = -1,
--	VCHIQ_SUCCESS = 0,
--	VCHIQ_RETRY   = 1
-+typedef enum
-+{
-+   VCHIQ_ERROR   = -1,
-+   VCHIQ_SUCCESS = 0,
-+   VCHIQ_RETRY   = 1
- } VCHIQ_STATUS_T;
- 
--typedef enum {
--	VCHIQ_BULK_MODE_CALLBACK,
--	VCHIQ_BULK_MODE_BLOCKING,
--	VCHIQ_BULK_MODE_NOCALLBACK,
--	VCHIQ_BULK_MODE_WAITING		/* Reserved for internal use */
-+typedef enum
-+{
-+   VCHIQ_BULK_MODE_CALLBACK,
-+   VCHIQ_BULK_MODE_BLOCKING,
-+   VCHIQ_BULK_MODE_NOCALLBACK
- } VCHIQ_BULK_MODE_T;
- 
--typedef enum {
--	VCHIQ_SERVICE_OPTION_AUTOCLOSE,
--	VCHIQ_SERVICE_OPTION_SLOT_QUOTA,
--	VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA,
--	VCHIQ_SERVICE_OPTION_SYNCHRONOUS
-+typedef enum
-+{
-+   VCHIQ_SERVICE_OPTION_AUTOCLOSE,
-+   VCHIQ_SERVICE_OPTION_SLOT_QUOTA,
-+   VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA
- } VCHIQ_SERVICE_OPTION_T;
- 
-+#ifdef __HIGHC__
-+/* Allow zero-sized arrays without warnings */
-+#pragma warning (push)
-+#pragma warning (disable : 4200)
-+#endif
-+
- typedef struct vchiq_header_struct {
--	/* The message identifier - opaque to applications. */
--	int msgid;
-+   /* The message identifier - opaque to applications. */
-+   int msgid;
- 
--	/* Size of message data. */
--	unsigned int size;
-+   /* Size of message data. */
-+   unsigned int size;      
- 
--	char data[0];           /* message */
-+   char data[0];           /* message */
- } VCHIQ_HEADER_T;
- 
-+#ifdef __HIGHC__
-+#pragma warning (pop)
-+#endif
-+
- typedef struct {
--	const void *data;
--	int size;
-+   const void *data;
-+   int size;
- } VCHIQ_ELEMENT_T;
- 
--typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
-+typedef const struct vchiq_service_base_struct *VCHIQ_SERVICE_HANDLE_T;
- 
--typedef VCHIQ_STATUS_T (*VCHIQ_CALLBACK_T)(VCHIQ_REASON_T, VCHIQ_HEADER_T *,
--	VCHIQ_SERVICE_HANDLE_T, void *);
-+typedef VCHIQ_STATUS_T (*VCHIQ_CALLBACK_T)(VCHIQ_REASON_T, VCHIQ_HEADER_T *, VCHIQ_SERVICE_HANDLE_T, void *);
- 
- typedef struct vchiq_service_base_struct {
--	int fourcc;
--	VCHIQ_CALLBACK_T callback;
--	void *userdata;
-+   int fourcc;
-+   VCHIQ_CALLBACK_T callback;
-+   void *userdata;
- } VCHIQ_SERVICE_BASE_T;
- 
- typedef struct vchiq_service_params_struct {
--	int fourcc;
--	VCHIQ_CALLBACK_T callback;
--	void *userdata;
--	short version;       /* Increment for non-trivial changes */
--	short version_min;   /* Update for incompatible changes */
-+   int fourcc;
-+   VCHIQ_CALLBACK_T callback;
-+   void *userdata;
-+   short version;       /* Increment for non-trivial changes */
-+   short version_min;   /* Update for incompatible changes */
- } VCHIQ_SERVICE_PARAMS_T;
- 
- typedef struct vchiq_config_struct {
--	int max_msg_size;
--	int bulk_threshold; /* The message size aboce which it is better to use
--				a bulk transfer (<= max_msg_size) */
--	int max_outstanding_bulks;
--	int max_services;
--	short version;      /* The version of VCHIQ */
--	short version_min;  /* The minimum compatible version of VCHIQ */
-+   int max_msg_size;
-+   int bulk_threshold; /* The message size aboce which it is better to use
-+                          a bulk transfer (<= max_msg_size) */
-+   int max_outstanding_bulks;
-+   int max_services;
-+   short version;      /* The version of VCHIQ */
-+   short version_min;  /* The minimum compatible version of VCHIQ */
- } VCHIQ_CONFIG_T;
- 
- typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
--typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
-+typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void* cb_arg);
-+
- 
- extern VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
- extern VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance);
- extern VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance);
--extern VCHIQ_STATUS_T vchiq_add_service(VCHIQ_INSTANCE_T instance,
--	const VCHIQ_SERVICE_PARAMS_T *params,
--	VCHIQ_SERVICE_HANDLE_T *pservice);
--extern VCHIQ_STATUS_T vchiq_open_service(VCHIQ_INSTANCE_T instance,
--	const VCHIQ_SERVICE_PARAMS_T *params,
--	VCHIQ_SERVICE_HANDLE_T *pservice);
-+extern VCHIQ_STATUS_T vchiq_add_service(VCHIQ_INSTANCE_T instance, int fourcc, VCHIQ_CALLBACK_T callback, void *userdata, VCHIQ_SERVICE_HANDLE_T *pservice);
-+extern VCHIQ_STATUS_T vchiq_open_service(VCHIQ_INSTANCE_T instance, int fourcc, VCHIQ_CALLBACK_T callback, void *userdata, VCHIQ_SERVICE_HANDLE_T *pservice);
-+extern VCHIQ_STATUS_T vchiq_add_service_params(VCHIQ_INSTANCE_T instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHIQ_SERVICE_HANDLE_T *pservice);
-+extern VCHIQ_STATUS_T vchiq_open_service_params(VCHIQ_INSTANCE_T instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHIQ_SERVICE_HANDLE_T *pservice);
- extern VCHIQ_STATUS_T vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);
- extern VCHIQ_STATUS_T vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);
- extern VCHIQ_STATUS_T vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
- extern VCHIQ_STATUS_T vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
- 
--extern VCHIQ_STATUS_T vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T service,
--	const VCHIQ_ELEMENT_T *elements, int count);
--extern void           vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service,
--	VCHIQ_HEADER_T *header);
--extern VCHIQ_STATUS_T vchiq_queue_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
--	const void *data, int size, void *userdata);
--extern VCHIQ_STATUS_T vchiq_queue_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
--	void *data, int size, void *userdata);
--extern VCHIQ_STATUS_T vchiq_queue_bulk_transmit_handle(
--	VCHIQ_SERVICE_HANDLE_T service, VCHI_MEM_HANDLE_T handle,
--	const void *offset, int size, void *userdata);
--extern VCHIQ_STATUS_T vchiq_queue_bulk_receive_handle(
--	VCHIQ_SERVICE_HANDLE_T service, VCHI_MEM_HANDLE_T handle,
--	void *offset, int size, void *userdata);
--extern VCHIQ_STATUS_T vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
--	const void *data, int size, void *userdata, VCHIQ_BULK_MODE_T mode);
--extern VCHIQ_STATUS_T vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
--	void *data, int size, void *userdata, VCHIQ_BULK_MODE_T mode);
--extern VCHIQ_STATUS_T vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service,
--	VCHI_MEM_HANDLE_T handle, const void *offset, int size, void *userdata,
--	VCHIQ_BULK_MODE_T mode);
--extern VCHIQ_STATUS_T vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
--	VCHI_MEM_HANDLE_T handle, void *offset, int size, void *userdata,
--	VCHIQ_BULK_MODE_T mode);
--extern int   vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T service);
--extern void *vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T service);
--extern int   vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T service);
--extern VCHIQ_STATUS_T vchiq_get_config(VCHIQ_INSTANCE_T instance,
--	int config_size, VCHIQ_CONFIG_T *pconfig);
--extern VCHIQ_STATUS_T vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,
--	VCHIQ_SERVICE_OPTION_T option, int value);
-+extern VCHIQ_STATUS_T vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T service, const VCHIQ_ELEMENT_T *elements, int count);
-+extern void           vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service, VCHIQ_HEADER_T *header);
-+extern VCHIQ_STATUS_T vchiq_queue_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service, const void *data, int size, void *userdata);
-+extern VCHIQ_STATUS_T vchiq_queue_bulk_receive(VCHIQ_SERVICE_HANDLE_T service, void *data, int size, void *userdata);
-+extern VCHIQ_STATUS_T vchiq_queue_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service, VCHI_MEM_HANDLE_T handle, const void *offset, int size, void *userdata);
-+extern VCHIQ_STATUS_T vchiq_queue_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service, VCHI_MEM_HANDLE_T handle, void *offset, int size, void *userdata);
-+extern VCHIQ_STATUS_T vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service, const void *data, int size, void *userdata, VCHIQ_BULK_MODE_T mode);
-+extern VCHIQ_STATUS_T vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service, void *data, int size, void *userdata, VCHIQ_BULK_MODE_T mode);
-+extern VCHIQ_STATUS_T vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service, VCHI_MEM_HANDLE_T handle, const void *offset, int size, void *userdata, VCHIQ_BULK_MODE_T mode);
-+extern VCHIQ_STATUS_T vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service, VCHI_MEM_HANDLE_T handle, void *offset, int size, void *userdata, VCHIQ_BULK_MODE_T mode);
-+extern int            vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T service);
-+extern VCHIQ_STATUS_T vchiq_get_config(VCHIQ_INSTANCE_T instance, int config_size, VCHIQ_CONFIG_T *pconfig);
-+extern VCHIQ_STATUS_T vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service, VCHIQ_SERVICE_OPTION_T option, int value);
- 
--extern VCHIQ_STATUS_T vchiq_remote_use(VCHIQ_INSTANCE_T instance,
--	VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
-+extern VCHIQ_STATUS_T vchiq_remote_use(VCHIQ_INSTANCE_T instance, VCHIQ_REMOTE_USE_CALLBACK_T callback, void* cb_arg);
- extern VCHIQ_STATUS_T vchiq_remote_release(VCHIQ_INSTANCE_T instance);
- 
--extern VCHIQ_STATUS_T vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
--	void *ptr, size_t num_bytes);
-+extern VCHIQ_STATUS_T vchiq_dump_phys_mem( VCHIQ_SERVICE_HANDLE_T service, void *ptr, size_t num_bytes );
- 
- #endif /* VCHIQ_IF_H */
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h	2012-10-21 15:15:10.016260046 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h	2012-10-17 18:57:47.000000000 +0200
-@@ -26,89 +26,80 @@
- #define VCHIQ_INVALID_HANDLE -1
- 
- typedef struct {
--	VCHIQ_SERVICE_PARAMS_T params;
--	int is_open;
--	int is_vchi;
--	int handle;       /* OUT */
-+   VCHIQ_SERVICE_PARAMS_T params;
-+   int is_open;
-+   int is_vchi;
-+   int handle;       /* OUT */
- } VCHIQ_CREATE_SERVICE_T;
- 
- typedef struct {
--	int handle;
--	int count;
--	const VCHIQ_ELEMENT_T *elements;
-+   int handle;
-+   int count;
-+   const VCHIQ_ELEMENT_T *elements;
- } VCHIQ_QUEUE_MESSAGE_T;
- 
- typedef struct {
--	int handle;
--	void *data;
--	int size;
--	void *userdata;
--	VCHIQ_BULK_MODE_T mode;
-+   int handle;
-+   void *data;
-+   int size;
-+   void *userdata;
-+   VCHIQ_BULK_MODE_T mode;
- } VCHIQ_QUEUE_BULK_TRANSFER_T;
- 
- typedef struct {
--	VCHIQ_REASON_T reason;
--	VCHIQ_HEADER_T *header;
--	void *service_userdata;
--	void *bulk_userdata;
-+   VCHIQ_REASON_T reason;
-+   VCHIQ_HEADER_T *header;
-+   void *service_userdata;
-+   void *bulk_userdata;
- } VCHIQ_COMPLETION_DATA_T;
- 
- typedef struct {
--	int count;
--	VCHIQ_COMPLETION_DATA_T *buf;
--	int msgbufsize;
--	int msgbufcount; /* IN/OUT */
--	void **msgbufs;
-+   int count;
-+   VCHIQ_COMPLETION_DATA_T *buf;
-+   int msgbufsize;
-+   int msgbufcount; /* IN/OUT */
-+   void **msgbufs;
- } VCHIQ_AWAIT_COMPLETION_T;
- 
- typedef struct {
--	int handle;
--	int blocking;
--	int bufsize;
--	void *buf;
-+   int handle;
-+   int blocking;
-+   int bufsize;
-+   void *buf;
- } VCHIQ_DEQUEUE_MESSAGE_T;
- 
- typedef struct {
--	int config_size;
--	VCHIQ_CONFIG_T *pconfig;
-+   int config_size;
-+   VCHIQ_CONFIG_T *pconfig;
- } VCHIQ_GET_CONFIG_T;
- 
- typedef struct {
--	int handle;
--	VCHIQ_SERVICE_OPTION_T option;
--	int value;
-+   int handle;
-+   VCHIQ_SERVICE_OPTION_T option;
-+   int value;
- } VCHIQ_SET_SERVICE_OPTION_T;
- 
- typedef struct {
--	void     *virt_addr;
--	size_t    num_bytes;
-+   void     *virt_addr;
-+   size_t    num_bytes;
- } VCHIQ_DUMP_MEM_T;
- 
- #define VCHIQ_IOC_CONNECT              _IO(VCHIQ_IOC_MAGIC,   0)
- #define VCHIQ_IOC_SHUTDOWN             _IO(VCHIQ_IOC_MAGIC,   1)
--#define VCHIQ_IOC_CREATE_SERVICE \
--	_IOWR(VCHIQ_IOC_MAGIC, 2, VCHIQ_CREATE_SERVICE_T)
-+#define VCHIQ_IOC_CREATE_SERVICE       _IOWR(VCHIQ_IOC_MAGIC, 2, VCHIQ_CREATE_SERVICE_T)
- #define VCHIQ_IOC_REMOVE_SERVICE       _IO(VCHIQ_IOC_MAGIC,   3)
--#define VCHIQ_IOC_QUEUE_MESSAGE \
--	_IOW(VCHIQ_IOC_MAGIC,  4, VCHIQ_QUEUE_MESSAGE_T)
--#define VCHIQ_IOC_QUEUE_BULK_TRANSMIT \
--	_IOWR(VCHIQ_IOC_MAGIC, 5, VCHIQ_QUEUE_BULK_TRANSFER_T)
--#define VCHIQ_IOC_QUEUE_BULK_RECEIVE \
--	_IOWR(VCHIQ_IOC_MAGIC, 6, VCHIQ_QUEUE_BULK_TRANSFER_T)
--#define VCHIQ_IOC_AWAIT_COMPLETION \
--	_IOWR(VCHIQ_IOC_MAGIC, 7, VCHIQ_AWAIT_COMPLETION_T)
--#define VCHIQ_IOC_DEQUEUE_MESSAGE \
--	_IOWR(VCHIQ_IOC_MAGIC, 8, VCHIQ_DEQUEUE_MESSAGE_T)
-+#define VCHIQ_IOC_QUEUE_MESSAGE        _IOW(VCHIQ_IOC_MAGIC,  4, VCHIQ_QUEUE_MESSAGE_T)
-+#define VCHIQ_IOC_QUEUE_BULK_TRANSMIT  _IOW(VCHIQ_IOC_MAGIC,  5, VCHIQ_QUEUE_BULK_TRANSFER_T)
-+#define VCHIQ_IOC_QUEUE_BULK_RECEIVE   _IOW(VCHIQ_IOC_MAGIC,  6, VCHIQ_QUEUE_BULK_TRANSFER_T)
-+#define VCHIQ_IOC_AWAIT_COMPLETION     _IOWR(VCHIQ_IOC_MAGIC, 7, VCHIQ_AWAIT_COMPLETION_T)
-+#define VCHIQ_IOC_DEQUEUE_MESSAGE      _IOWR(VCHIQ_IOC_MAGIC, 8, VCHIQ_DEQUEUE_MESSAGE_T)
- #define VCHIQ_IOC_GET_CLIENT_ID        _IO(VCHIQ_IOC_MAGIC,   9)
--#define VCHIQ_IOC_GET_CONFIG \
--	_IOWR(VCHIQ_IOC_MAGIC, 10, VCHIQ_GET_CONFIG_T)
-+#define VCHIQ_IOC_GET_CONFIG           _IOWR(VCHIQ_IOC_MAGIC, 10, VCHIQ_GET_CONFIG_T)
- #define VCHIQ_IOC_CLOSE_SERVICE        _IO(VCHIQ_IOC_MAGIC,   11)
- #define VCHIQ_IOC_USE_SERVICE          _IO(VCHIQ_IOC_MAGIC,   12)
- #define VCHIQ_IOC_RELEASE_SERVICE      _IO(VCHIQ_IOC_MAGIC,   13)
--#define VCHIQ_IOC_SET_SERVICE_OPTION \
--	_IOW(VCHIQ_IOC_MAGIC,  14, VCHIQ_SET_SERVICE_OPTION_T)
--#define VCHIQ_IOC_DUMP_PHYS_MEM \
--	_IOW(VCHIQ_IOC_MAGIC,  15, VCHIQ_DUMP_MEM_T)
-+#define VCHIQ_IOC_SET_SERVICE_OPTION   _IOW(VCHIQ_IOC_MAGIC,  14, VCHIQ_SET_SERVICE_OPTION_T)
-+#define VCHIQ_IOC_DUMP_PHYS_MEM        _IOW(VCHIQ_IOC_MAGIC,  15, VCHIQ_DUMP_MEM_T)
- #define VCHIQ_IOC_MAX                  15
- 
- #endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c	2012-10-21 15:15:10.017260066 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c	2012-10-17 18:57:47.000000000 +0200
-@@ -16,78 +16,64 @@
- 
- #include <linux/kernel.h>
- #include <linux/module.h>
--#include <linux/mutex.h>
- 
- #include "vchiq_core.h"
- #include "vchiq_arm.h"
-+#include "interface/vcos/vcos_logging.h"
- 
- /* ---- Public Variables ------------------------------------------------- */
- 
--/* ---- Private Constants and Types -------------------------------------- */
-+extern VCOS_LOG_CAT_T vchiq_core_log_category;
-+#define  VCOS_LOG_CATEGORY (&vchiq_core_log_category)
- 
--struct bulk_waiter_node {
--	struct bulk_waiter bulk_waiter;
--	int pid;
--	struct list_head list;
--};
-+/* ---- Private Constants and Types -------------------------------------- */
- 
- struct vchiq_instance_struct {
--	VCHIQ_STATE_T *state;
-+   VCHIQ_STATE_T *state;
- 
--	int connected;
--
--	struct list_head bulk_waiter_list;
--	struct mutex bulk_waiter_list_mutex;
-+   int connected;
- };
- 
--static VCHIQ_STATUS_T
--vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
--	int size, VCHIQ_BULK_DIR_T dir);
--
- /****************************************************************************
- *
- *   vchiq_initialise
- *
- ***************************************************************************/
- 
--VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instanceOut)
-+VCHIQ_STATUS_T vchiq_initialise( VCHIQ_INSTANCE_T *instanceOut )
- {
--	VCHIQ_STATUS_T status = VCHIQ_ERROR;
--	VCHIQ_STATE_T *state;
--	VCHIQ_INSTANCE_T instance = NULL;
--
--	vchiq_log_trace(vchiq_core_log_level, "%s called", __func__);
--
--	state = vchiq_get_state();
--	if (!state) {
--		vchiq_log_error(vchiq_core_log_level,
--			"%s: videocore not initialized\n", __func__);
--		goto failed;
--	}
--
--	instance = kzalloc(sizeof(*instance), GFP_KERNEL);
--	if (!instance) {
--		vchiq_log_error(vchiq_core_log_level,
--			"%s: error allocating vchiq instance\n", __func__);
--		goto failed;
--	}
--
--	instance->connected = 0;
--	instance->state = state;
--	mutex_init(&instance->bulk_waiter_list_mutex);
--	INIT_LIST_HEAD(&instance->bulk_waiter_list);
--
--	*instanceOut = instance;
--
--	status = VCHIQ_SUCCESS;
-+   VCHIQ_STATUS_T status = VCHIQ_ERROR;
-+   VCHIQ_STATE_T *state;
-+   VCHIQ_INSTANCE_T instance = NULL;
-+
-+   vcos_log_trace( "%s called", __func__ );
-+
-+   state = vchiq_get_state();
-+   if (!state)
-+   {
-+      printk( KERN_ERR "%s: videocore not initialized\n", __func__ );
-+      goto failed;
-+   }
-+
-+   instance = kzalloc( sizeof(*instance), GFP_KERNEL );
-+   if( !instance )
-+   {
-+      printk( KERN_ERR "%s: error allocating vchiq instance\n", __func__ );
-+      goto failed;
-+   }
-+
-+   instance->connected = 0;
-+   instance->state = state;
-+
-+   *instanceOut = instance;
-+   
-+   status = VCHIQ_SUCCESS;
- 
- failed:
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p): returning %d", __func__, instance, status);
-+   vcos_log_trace( "%s(%p): returning %d", __func__, instance, status );
- 
--	return status;
-+   return status;
- }
--EXPORT_SYMBOL(vchiq_initialise);
- 
- /****************************************************************************
- *
-@@ -95,46 +81,27 @@
- *
- ***************************************************************************/
- 
--VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
-+VCHIQ_STATUS_T vchiq_shutdown( VCHIQ_INSTANCE_T instance )
- {
--	VCHIQ_STATUS_T status;
--	VCHIQ_STATE_T *state = instance->state;
-+   VCHIQ_STATUS_T status;
-+   VCHIQ_STATE_T *state = instance->state;
-+
-+   vcos_log_trace( "%s(%p) called", __func__, instance );
- 
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p) called", __func__, instance);
-+   vcos_mutex_lock(&state->mutex);
- 
--	if (mutex_lock_interruptible(&state->mutex) != 0)
--		return VCHIQ_RETRY;
-+   /* Remove all services */
-+   status = vchiq_shutdown_internal(state, instance);
- 
--	/* Remove all services */
--	status = vchiq_shutdown_internal(state, instance);
--
--	mutex_unlock(&state->mutex);
--
--	if (status == VCHIQ_SUCCESS) {
--		struct list_head *pos, *next;
--		list_for_each_safe(pos, next,
--				&instance->bulk_waiter_list) {
--			struct bulk_waiter_node *waiter;
--			waiter = list_entry(pos,
--					struct bulk_waiter_node,
--					list);
--			list_del(pos);
--			vchiq_log_info(vchiq_arm_log_level,
--					"bulk_waiter - cleaned up %x "
--					"for pid %d",
--					(unsigned int)waiter, waiter->pid);
--			kfree(waiter);
--		}
--		kfree(instance);
--	}
-+   vcos_mutex_unlock(&state->mutex);
- 
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p): returning %d", __func__, instance, status);
-+   if (status == VCHIQ_SUCCESS)
-+      kfree(instance);
- 
--	return status;
-+   vcos_log_trace( "%s(%p): returning %d", __func__, instance, status );
-+
-+   return status;
- }
--EXPORT_SYMBOL(vchiq_shutdown);
- 
- /****************************************************************************
- *
-@@ -144,7 +111,7 @@
- 
- int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
- {
--	return instance->connected;
-+   return instance->connected;
- }
- 
- /****************************************************************************
-@@ -155,32 +122,28 @@
- 
- VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
- {
--	VCHIQ_STATUS_T status;
--	VCHIQ_STATE_T *state = instance->state;
-+   VCHIQ_STATUS_T status;
-+   VCHIQ_STATE_T *state = instance->state;
- 
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p) called", __func__, instance);
-+   vcos_log_trace( "%s(%p) called", __func__, instance );
- 
--	if (mutex_lock_interruptible(&state->mutex) != 0) {
--		vchiq_log_trace(vchiq_core_log_level,
--			"%s: call to mutex_lock failed", __func__);
--		status = VCHIQ_RETRY;
--		goto failed;
--	}
--	status = vchiq_connect_internal(state, instance);
-+   if (vcos_mutex_lock(&state->mutex) != VCOS_SUCCESS) {
-+      vcos_log_trace( "%s: call to vcos_mutex_lock failed", __func__ );
-+      status = VCHIQ_RETRY;
-+      goto failed;
-+   }
-+   status = vchiq_connect_internal(state, instance);
- 
--	if (status == VCHIQ_SUCCESS)
--		instance->connected = 1;
-+   if (status == VCHIQ_SUCCESS)
-+      instance->connected = 1;
- 
--	mutex_unlock(&state->mutex);
-+   vcos_mutex_unlock(&state->mutex);
- 
- failed:
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p): returning %d", __func__, instance, status);
-+   vcos_log_trace( "%s(%p): returning %d", __func__, instance, status );
- 
--	return status;
-+   return status;
- }
--EXPORT_SYMBOL(vchiq_connect);
- 
- /****************************************************************************
- *
-@@ -189,42 +152,22 @@
- ***************************************************************************/
- 
- VCHIQ_STATUS_T vchiq_add_service(
--	VCHIQ_INSTANCE_T              instance,
--	const VCHIQ_SERVICE_PARAMS_T *params,
--	VCHIQ_SERVICE_HANDLE_T       *phandle)
--{
--	VCHIQ_STATUS_T status;
--	VCHIQ_STATE_T *state = instance->state;
--	VCHIQ_SERVICE_T *service = NULL;
--	int srvstate;
--
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p) called", __func__, instance);
--
--	*phandle = VCHIQ_SERVICE_HANDLE_INVALID;
--
--	srvstate = vchiq_is_connected(instance)
--		? VCHIQ_SRVSTATE_LISTENING
--		: VCHIQ_SRVSTATE_HIDDEN;
--
--	service = vchiq_add_service_internal(
--		state,
--		params,
--		srvstate,
--		instance);
--
--	if (service) {
--		*phandle = service->handle;
--		status = VCHIQ_SUCCESS;
--	} else
--		status = VCHIQ_ERROR;
--
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p): returning %d", __func__, instance, status);
-+   VCHIQ_INSTANCE_T        instance,
-+   int                     fourcc,
-+   VCHIQ_CALLBACK_T        callback,
-+   void                   *userdata,
-+   VCHIQ_SERVICE_HANDLE_T *pservice)
-+{
-+   VCHIQ_SERVICE_PARAMS_T params;
-+
-+   params.fourcc        = fourcc;
-+   params.callback      = callback;
-+   params.userdata      = userdata;
-+   params.version       = 0;
-+   params.version_min   = 0;
- 
--	return status;
-+   return vchiq_add_service_params(instance, &params, pservice);
- }
--EXPORT_SYMBOL(vchiq_add_service);
- 
- /****************************************************************************
- *
-@@ -233,192 +176,122 @@
- ***************************************************************************/
- 
- VCHIQ_STATUS_T vchiq_open_service(
--	VCHIQ_INSTANCE_T              instance,
--	const VCHIQ_SERVICE_PARAMS_T *params,
--	VCHIQ_SERVICE_HANDLE_T       *phandle)
--{
--	VCHIQ_STATUS_T   status = VCHIQ_ERROR;
--	VCHIQ_STATE_T   *state = instance->state;
--	VCHIQ_SERVICE_T *service = NULL;
--
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p) called", __func__, instance);
--
--	*phandle = VCHIQ_SERVICE_HANDLE_INVALID;
--
--	if (!vchiq_is_connected(instance))
--		goto failed;
--
--	service = vchiq_add_service_internal(state,
--		params,
--		VCHIQ_SRVSTATE_OPENING,
--		instance);
--
--	if (service) {
--		status = vchiq_open_service_internal(service, current->pid);
--		if (status == VCHIQ_SUCCESS)
--			*phandle = service->handle;
--		else
--			vchiq_remove_service(service->handle);
--	}
-+   VCHIQ_INSTANCE_T        instance,
-+   int                     fourcc,
-+   VCHIQ_CALLBACK_T        callback,
-+   void                   *userdata,
-+   VCHIQ_SERVICE_HANDLE_T *pservice)
-+{
-+   VCHIQ_SERVICE_PARAMS_T params;
-+
-+   params.fourcc        = fourcc;
-+   params.callback      = callback;
-+   params.userdata      = userdata;
-+   params.version       = 0;
-+   params.version_min   = 0;
- 
--failed:
--	vchiq_log_trace(vchiq_core_log_level,
--		"%s(%p): returning %d", __func__, instance, status);
--
--	return status;
--}
--EXPORT_SYMBOL(vchiq_open_service);
--
--VCHIQ_STATUS_T
--vchiq_queue_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle,
--	const void *data, int size, void *userdata)
--{
--	return vchiq_bulk_transfer(handle,
--		VCHI_MEM_HANDLE_INVALID, (void *)data, size, userdata,
--		VCHIQ_BULK_MODE_CALLBACK, VCHIQ_BULK_TRANSMIT);
-+   return vchiq_open_service_params(instance, &params, pservice);
- }
--EXPORT_SYMBOL(vchiq_queue_bulk_transmit);
- 
--VCHIQ_STATUS_T
--vchiq_queue_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data, int size,
--	void *userdata)
--{
--	return vchiq_bulk_transfer(handle,
--		VCHI_MEM_HANDLE_INVALID, data, size, userdata,
--		VCHIQ_BULK_MODE_CALLBACK, VCHIQ_BULK_RECEIVE);
--}
--EXPORT_SYMBOL(vchiq_queue_bulk_receive);
-+/****************************************************************************
-+*
-+*   vchiq_add_service_params
-+*
-+***************************************************************************/
- 
--VCHIQ_STATUS_T
--vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data, int size,
--	void *userdata, VCHIQ_BULK_MODE_T mode)
--{
--	VCHIQ_STATUS_T status;
-+VCHIQ_STATUS_T vchiq_add_service_params(
-+   VCHIQ_INSTANCE_T              instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHIQ_SERVICE_HANDLE_T       *pservice)
-+{
-+   VCHIQ_STATUS_T status;
-+   VCHIQ_STATE_T *state = instance->state;
-+   VCHIQ_SERVICE_T *service;
-+   int srvstate;
-+
-+   vcos_log_trace( "%s(%p) called", __func__, instance );
-+
-+   *pservice = NULL;
-+
-+   srvstate = vchiq_is_connected( instance )
-+      ? VCHIQ_SRVSTATE_LISTENING
-+      : VCHIQ_SRVSTATE_HIDDEN;
-+
-+   vcos_mutex_lock(&state->mutex);
-+
-+   service = vchiq_add_service_internal(
-+      state,
-+      params,
-+      srvstate,
-+      instance);
-+
-+   vcos_mutex_unlock(&state->mutex);
-+
-+   if ( service  )
-+   {
-+      *pservice = &service->base;
-+      status = VCHIQ_SUCCESS;
-+   }
-+   else
-+   {
-+      status = VCHIQ_ERROR;
-+   }
- 
--	switch (mode) {
--	case VCHIQ_BULK_MODE_NOCALLBACK:
--	case VCHIQ_BULK_MODE_CALLBACK:
--		status = vchiq_bulk_transfer(handle,
--			VCHI_MEM_HANDLE_INVALID, (void *)data, size, userdata,
--			mode, VCHIQ_BULK_TRANSMIT);
--		break;
--	case VCHIQ_BULK_MODE_BLOCKING:
--		status = vchiq_blocking_bulk_transfer(handle,
--			(void *)data, size, VCHIQ_BULK_TRANSMIT);
--		break;
--	default:
--		return VCHIQ_ERROR;
--	}
-+   vcos_log_trace( "%s(%p): returning %d", __func__, instance, status );
- 
--	return status;
-+   return status;
- }
--EXPORT_SYMBOL(vchiq_bulk_transmit);
--
--VCHIQ_STATUS_T
--vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data, int size,
--	void *userdata, VCHIQ_BULK_MODE_T mode)
--{
--	VCHIQ_STATUS_T status;
- 
--	switch (mode) {
--	case VCHIQ_BULK_MODE_NOCALLBACK:
--	case VCHIQ_BULK_MODE_CALLBACK:
--		status = vchiq_bulk_transfer(handle,
--			VCHI_MEM_HANDLE_INVALID, data, size, userdata,
--			mode, VCHIQ_BULK_RECEIVE);
--		break;
--	case VCHIQ_BULK_MODE_BLOCKING:
--		status = vchiq_blocking_bulk_transfer(handle,
--			(void *)data, size, VCHIQ_BULK_RECEIVE);
--		break;
--	default:
--		return VCHIQ_ERROR;
--	}
-+/****************************************************************************
-+*
-+*   vchiq_open_service_params
-+*
-+***************************************************************************/
- 
--	return status;
--}
--EXPORT_SYMBOL(vchiq_bulk_receive);
-+VCHIQ_STATUS_T vchiq_open_service_params(
-+   VCHIQ_INSTANCE_T              instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHIQ_SERVICE_HANDLE_T       *pservice)
-+{
-+   VCHIQ_STATUS_T   status = VCHIQ_ERROR;
-+   VCHIQ_STATE_T   *state = instance->state;
-+   VCHIQ_SERVICE_T *service;
-+
-+   vcos_log_trace( "%s(%p) called", __func__, instance );
-+
-+   *pservice = NULL;
-+
-+   if (!vchiq_is_connected(instance))
-+      goto failed;
-+
-+   vcos_mutex_lock(&state->mutex);
-+
-+   service = vchiq_add_service_internal(state,
-+      params,
-+      VCHIQ_SRVSTATE_OPENING,
-+      instance);
-+
-+   vcos_mutex_unlock(&state->mutex);
-+
-+   if ( service  )
-+   {
-+      status = vchiq_open_service_internal(service, current->pid);
-+      if ( status == VCHIQ_SUCCESS )
-+         *pservice = &service->base;
-+      else
-+         vchiq_remove_service(&service->base);
-+   }
- 
--static VCHIQ_STATUS_T
--vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
--	int size, VCHIQ_BULK_DIR_T dir)
--{
--	VCHIQ_INSTANCE_T instance;
--	VCHIQ_SERVICE_T *service;
--	VCHIQ_STATUS_T status;
--	struct bulk_waiter_node *waiter = NULL;
--	struct list_head *pos;
--
--	service = find_service_by_handle(handle);
--	if (!service)
--		return VCHIQ_ERROR;
--
--	instance = service->instance;
--
--	unlock_service(service);
--
--	mutex_lock(&instance->bulk_waiter_list_mutex);
--	list_for_each(pos, &instance->bulk_waiter_list) {
--		if (list_entry(pos, struct bulk_waiter_node,
--				list)->pid == current->pid) {
--			waiter = list_entry(pos,
--				struct bulk_waiter_node,
--				list);
--			list_del(pos);
--			break;
--		}
--	}
--	mutex_unlock(&instance->bulk_waiter_list_mutex);
--
--	if (waiter) {
--		VCHIQ_BULK_T *bulk = waiter->bulk_waiter.bulk;
--		if (bulk) {
--			/* This thread has an outstanding bulk transfer. */
--			if ((bulk->data != data) ||
--				(bulk->size != size)) {
--				/* This is not a retry of the previous one.
--				** Cancel the signal when the transfer
--				** completes. */
--				spin_lock(&bulk_waiter_spinlock);
--				bulk->userdata = NULL;
--				spin_unlock(&bulk_waiter_spinlock);
--			}
--		}
--	}
--
--	if (!waiter) {
--		waiter = kzalloc(sizeof(struct bulk_waiter_node), GFP_KERNEL);
--		if (!waiter) {
--			vchiq_log_error(vchiq_core_log_level,
--				"%s - out of memory", __func__);
--			return VCHIQ_ERROR;
--		}
--	}
--
--	status = vchiq_bulk_transfer(handle, VCHI_MEM_HANDLE_INVALID,
--		data, size, &waiter->bulk_waiter, VCHIQ_BULK_MODE_BLOCKING,
--		dir);
--	if ((status != VCHIQ_RETRY) || fatal_signal_pending(current) ||
--		!waiter->bulk_waiter.bulk) {
--		VCHIQ_BULK_T *bulk = waiter->bulk_waiter.bulk;
--		if (bulk) {
--			/* Cancel the signal when the transfer
--			 ** completes. */
--			spin_lock(&bulk_waiter_spinlock);
--			bulk->userdata = NULL;
--			spin_unlock(&bulk_waiter_spinlock);
--		}
--		kfree(waiter);
--	} else {
--		waiter->pid = current->pid;
--		mutex_lock(&instance->bulk_waiter_list_mutex);
--		list_add(&waiter->list, &instance->bulk_waiter_list);
--		mutex_unlock(&instance->bulk_waiter_list_mutex);
--		vchiq_log_info(vchiq_arm_log_level,
--				"saved bulk_waiter %x for pid %d",
--				(unsigned int)waiter, current->pid);
--	}
-+failed:
-+   vcos_log_trace( "%s(%p): returning %d", __func__, instance, status );
- 
--	return status;
-+   return status;
- }
-+
-+EXPORT_SYMBOL(vchiq_initialise);
-+EXPORT_SYMBOL(vchiq_shutdown);
-+EXPORT_SYMBOL(vchiq_connect);
-+EXPORT_SYMBOL(vchiq_add_service);
-+EXPORT_SYMBOL(vchiq_open_service);
-+EXPORT_SYMBOL(vchiq_add_service_params);
-+EXPORT_SYMBOL(vchiq_open_service_params);
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,1628 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <stdio.h>
-+
-+#include "vchiq.h"
-+#include "vchiq_cfg.h"
-+#include "vchiq_ioctl.h"
-+#include "interface/vchi/vchi.h"
-+#include "interface/vchi/common/endian.h"
-+#include "interface/vcos/vcos.h"
-+
-+#define VCHIQ_MAX_INSTANCE_SERVICES 32
-+#define MSGBUF_SIZE (VCHIQ_MAX_MSG_SIZE + sizeof(VCHIQ_HEADER_T))
-+
-+#define RETRY(r,x) do { r = x; } while ((r == -1) && (errno == EINTR))
-+
-+#define VCOS_LOG_CATEGORY (&vchiq_lib_log_category)
-+
-+typedef struct vchiq_service_struct
-+{
-+   VCHIQ_SERVICE_BASE_T base;
-+   int handle;
-+   int fd;
-+   VCHI_CALLBACK_T vchi_callback;
-+   void *peek_buf;
-+   int peek_size;
-+   int client_id;
-+} VCHIQ_SERVICE_T;
-+
-+typedef struct vchiq_service_struct VCHI_SERVICE_T;
-+
-+struct vchiq_instance_struct
-+{
-+   int fd;
-+   int initialised;
-+   int connected;
-+   VCOS_THREAD_T completion_thread;
-+   VCOS_MUTEX_T mutex;
-+   int used_services;
-+   VCHIQ_SERVICE_T services[VCHIQ_MAX_INSTANCE_SERVICES];
-+} vchiq_instance;
-+
-+typedef struct vchiq_instance_struct VCHI_STATE_T;
-+
-+/* Local data */
-+static VCOS_LOG_LEVEL_T vchiq_default_lib_log_level = VCOS_LOG_WARN;
-+static VCOS_LOG_CAT_T vchiq_lib_log_category;
-+static VCOS_MUTEX_T vchiq_lib_mutex;
-+static void *free_msgbufs;
-+
-+
-+/* Local utility functions */
-+static VCHIQ_INSTANCE_T
-+vchiq_lib_init(void);
-+
-+static void *completion_thread(void *);
-+
-+static VCHIQ_STATUS_T
-+create_service(VCHIQ_INSTANCE_T instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHI_CALLBACK_T vchi_callback,
-+   int is_open,
-+   VCHIQ_SERVICE_HANDLE_T *pservice);
-+
-+static int
-+fill_peek_buf(VCHI_SERVICE_T *service,
-+   VCHI_FLAGS_T flags);
-+
-+static void *
-+alloc_msgbuf(void);
-+
-+static void
-+free_msgbuf(void *buf);
-+
-+static __inline int
-+is_valid_instance(VCHIQ_INSTANCE_T instance)
-+{
-+   return (instance == &vchiq_instance) && (instance->initialised > 0);
-+}
-+
-+static __inline int
-+is_valid_service(VCHIQ_SERVICE_T *service)
-+{
-+   return ((service != NULL) && (service->fd != VCHIQ_INVALID_HANDLE));
-+}
-+
-+/*
-+ * VCHIQ API
-+ */
-+
-+VCHIQ_STATUS_T
-+vchiq_initialise(VCHIQ_INSTANCE_T *pinstance)
-+{
-+   VCHIQ_INSTANCE_T instance;
-+
-+   instance = vchiq_lib_init();
-+
-+   vcos_log_trace( "%s: returning instance handle %p", __func__, instance );
-+
-+   *pinstance = instance;
-+
-+   return (instance != NULL) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_shutdown(VCHIQ_INSTANCE_T instance)
-+{
-+   vcos_log_trace( "%s called", __func__ );
-+
-+   if (!is_valid_instance(instance))
-+      return VCHIQ_ERROR;
-+
-+   vcos_mutex_lock(&instance->mutex);
-+
-+   if (instance->initialised == 1)
-+   {
-+      int i;
-+
-+      instance->initialised = -1; /* Enter limbo */
-+
-+      /* Remove all services */
-+
-+      for (i = 0; i < instance->used_services; i++)
-+      {
-+         if (instance->services[i].handle != VCHIQ_INVALID_HANDLE)
-+         {
-+            vchiq_remove_service(&instance->services[i].base);
-+            instance->services[i].handle = VCHIQ_INVALID_HANDLE;
-+         }
-+      }
-+
-+      if (instance->connected)
-+      {
-+         int ret;
-+         RETRY(ret, ioctl(instance->fd, VCHIQ_IOC_SHUTDOWN, 0));
-+         vcos_assert(ret == 0);
-+         vcos_thread_join(&instance->completion_thread, NULL);
-+         instance->connected = 0;
-+      }
-+
-+      close(instance->fd);
-+      instance->fd = -1;
-+   }
-+   else if (instance->initialised > 1)
-+   {
-+      instance->initialised--;
-+   }
-+
-+   vcos_mutex_unlock(&instance->mutex);
-+
-+   vcos_global_lock();
-+
-+   if (instance->initialised == -1)
-+   {
-+      vcos_mutex_delete(&instance->mutex);
-+      instance->initialised = 0;
-+   }
-+
-+   vcos_global_unlock();
-+
-+   vcos_log_trace( "%s returning", __func__ );
-+
-+   return VCHIQ_SUCCESS;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_connect(VCHIQ_INSTANCE_T instance)
-+{
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+
-+   vcos_log_trace( "%s called", __func__ );
-+
-+   if (!is_valid_instance(instance))
-+      return VCHIQ_ERROR;
-+
-+   vcos_mutex_lock(&instance->mutex);
-+
-+   if (!instance->connected)
-+   {
-+      int ret = ioctl(instance->fd, VCHIQ_IOC_CONNECT, 0);
-+      if (ret == 0)
-+      {
-+         VCOS_THREAD_ATTR_T attrs;
-+         instance->connected = 1;
-+         vcos_thread_attr_init(&attrs);
-+         vcos_thread_create(&instance->completion_thread, "VCHIQ completion",
-+                            &attrs, completion_thread, instance);
-+      }
-+      else
-+      {
-+         status = VCHIQ_ERROR;
-+      }
-+   }
-+
-+   vcos_mutex_unlock(&instance->mutex);
-+
-+   return status;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_add_service(VCHIQ_INSTANCE_T instance,
-+   int fourcc,
-+   VCHIQ_CALLBACK_T callback,
-+   void *userdata,
-+   VCHIQ_SERVICE_HANDLE_T *pservice)
-+{
-+   VCHIQ_SERVICE_PARAMS_T params;
-+
-+   params.fourcc        = fourcc;
-+   params.callback      = callback;
-+   params.userdata      = userdata;
-+   params.version       = 0;
-+   params.version_min   = 0;
-+
-+   return vchiq_add_service_params(instance, &params, pservice);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_open_service(VCHIQ_INSTANCE_T instance,
-+   int fourcc,
-+   VCHIQ_CALLBACK_T callback,
-+   void *userdata,
-+   VCHIQ_SERVICE_HANDLE_T *pservice)
-+{
-+   VCHIQ_SERVICE_PARAMS_T params;
-+
-+   params.fourcc        = fourcc;
-+   params.callback      = callback;
-+   params.userdata      = userdata;
-+   params.version       = 0;
-+   params.version_min   = 0;
-+
-+   return vchiq_open_service_params(instance, &params, pservice);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_add_service_params(VCHIQ_INSTANCE_T instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHIQ_SERVICE_HANDLE_T *pservice)
-+{
-+   VCHIQ_STATUS_T status;
-+
-+   vcos_log_trace( "%s called fourcc = 0x%08x (%c%c%c%c)",
-+                   __func__,
-+                   params->fourcc,
-+                   (params->fourcc >> 24) & 0xff,
-+                   (params->fourcc >> 16) & 0xff,
-+                   (params->fourcc >>  8) & 0xff,
-+                   (params->fourcc      ) & 0xff );
-+
-+   if (!params->callback)
-+      return VCHIQ_ERROR;
-+
-+   if (!is_valid_instance(instance))
-+      return VCHIQ_ERROR;
-+
-+   status = create_service(instance,
-+      params,
-+      NULL/*vchi_callback*/,
-+      0/*!open*/,
-+      pservice);
-+
-+   vcos_log_trace( "%s returning service handle = 0x%08x", __func__, (uint32_t)*pservice );
-+
-+   return status;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_open_service_params(VCHIQ_INSTANCE_T instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHIQ_SERVICE_HANDLE_T *pservice)
-+{
-+   VCHIQ_STATUS_T status;
-+
-+   vcos_log_trace( "%s called fourcc = 0x%08x (%c%c%c%c)",
-+                   __func__,
-+                   params->fourcc,
-+                   (params->fourcc >> 24) & 0xff,
-+                   (params->fourcc >> 16) & 0xff,
-+                   (params->fourcc >>  8) & 0xff,
-+                   (params->fourcc      ) & 0xff );
-+
-+   if (!params->callback)
-+      return VCHIQ_ERROR;
-+
-+   if (!is_valid_instance(instance))
-+      return VCHIQ_ERROR;
-+
-+   status = create_service(instance,
-+      params,
-+      NULL/*vchi_callback*/,
-+      1/*open*/,
-+      pservice);
-+
-+   vcos_log_trace( "%s returning service handle = 0x%08x", __func__, (uint32_t)*pservice );
-+
-+   return status;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   int ret;
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_CLOSE_SERVICE, service->handle));
-+
-+   if (ret != 0)
-+      return VCHIQ_ERROR;
-+
-+   service->handle = VCHIQ_INVALID_HANDLE;
-+   return VCHIQ_SUCCESS;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   int ret;
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_REMOVE_SERVICE, service->handle));
-+
-+   if (ret != 0)
-+      return VCHIQ_ERROR;
-+
-+   service->handle = VCHIQ_INVALID_HANDLE;
-+   return VCHIQ_SUCCESS;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
-+   const VCHIQ_ELEMENT_T *elements,
-+   int count)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_MESSAGE_T args;
-+   int ret;
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.elements = elements;
-+   args.count = count;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_MESSAGE, &args));
-+
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+void
-+vchiq_release_message(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHIQ_HEADER_T *header)
-+{
-+   vcos_log_trace( "%s handle=%08x, header=%x", __func__, (uint32_t)handle, (uint32_t)header );
-+
-+   free_msgbuf(header);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_queue_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle,
-+   const void *data,
-+   int size,
-+   void *userdata)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_BULK_TRANSFER_T args;
-+   int ret;
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.data = (void *)data;
-+   args.size = size;
-+   args.userdata = userdata;
-+   args.mode = VCHIQ_BULK_MODE_CALLBACK;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_BULK_TRANSMIT, &args));
-+
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_queue_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle,
-+   void *data,
-+   int size,
-+   void *userdata)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_BULK_TRANSFER_T args;
-+   int ret;
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.data = data;
-+   args.size = size;
-+   args.userdata = userdata;
-+   args.mode = VCHIQ_BULK_MODE_CALLBACK;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_BULK_RECEIVE, &args));
-+
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_queue_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle,
-+   const void *offset,
-+   int size,
-+   void *userdata)
-+{
-+   vcos_assert(memhandle == VCHI_MEM_HANDLE_INVALID);
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   return vchiq_queue_bulk_transmit(handle, offset, size, userdata);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_queue_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle,
-+   void *offset,
-+   int size,
-+   void *userdata)
-+{
-+   vcos_assert(memhandle == VCHI_MEM_HANDLE_INVALID);
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   return vchiq_queue_bulk_receive(handle, offset, size, userdata);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle,
-+   const void *data,
-+   int size,
-+   void *userdata,
-+   VCHIQ_BULK_MODE_T mode)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_BULK_TRANSFER_T args;
-+   int ret;
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.data = (void *)data;
-+   args.size = size;
-+   args.userdata = userdata;
-+   args.mode = mode;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_BULK_TRANSMIT, &args));
-+
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle,
-+   void *data,
-+   int size,
-+   void *userdata,
-+   VCHIQ_BULK_MODE_T mode)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_BULK_TRANSFER_T args;
-+   int ret;
-+
-+   vcos_log_trace( "%s called service handle = 0x%08x", __func__, (uint32_t)handle );
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.data = data;
-+   args.size = size;
-+   args.userdata = userdata;
-+   args.mode = mode;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_BULK_RECEIVE, &args));
-+
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle,
-+   const void *offset,
-+   int size,
-+   void *userdata,
-+   VCHIQ_BULK_MODE_T mode)
-+{
-+   vcos_assert(memhandle == VCHI_MEM_HANDLE_INVALID);
-+
-+   return vchiq_bulk_transmit(handle, offset, size, userdata, mode);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHI_MEM_HANDLE_T memhandle,
-+   void *offset,
-+   int size,
-+   void *userdata,
-+   VCHIQ_BULK_MODE_T mode)
-+{
-+   vcos_assert(memhandle == VCHI_MEM_HANDLE_INVALID);
-+
-+   return vchiq_bulk_receive(handle, offset, size, userdata, mode);
-+}
-+
-+int
-+vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T handle)
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   return ioctl(service->fd, VCHIQ_IOC_GET_CLIENT_ID, service->handle);
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_get_config(VCHIQ_INSTANCE_T instance,
-+   int config_size,
-+   VCHIQ_CONFIG_T *pconfig)
-+{
-+   VCHIQ_GET_CONFIG_T args;
-+   int ret;
-+
-+   if (!is_valid_instance(instance))
-+      return VCHIQ_ERROR;
-+
-+   args.config_size = config_size;
-+   args.pconfig = pconfig;
-+
-+   RETRY(ret, ioctl(instance->fd, VCHIQ_IOC_GET_CONFIG, &args));
-+
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+int32_t
-+vchiq_use_service( const VCHIQ_SERVICE_HANDLE_T handle )
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_USE_SERVICE, service->handle));
-+   return ret;
-+}
-+
-+int32_t
-+vchiq_release_service( const VCHIQ_SERVICE_HANDLE_T handle )
-+{
-+    VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+    int ret;
-+    RETRY(ret,ioctl(service->fd, VCHIQ_IOC_RELEASE_SERVICE, service->handle));
-+    return ret;
-+}
-+
-+VCHIQ_STATUS_T
-+vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T handle,
-+   VCHIQ_SERVICE_OPTION_T option, int value)
-+{
-+   VCHIQ_SET_SERVICE_OPTION_T args;
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.option = option;
-+   args.value  = value;
-+
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_SET_SERVICE_OPTION, &args));
-+
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+/*
-+ * VCHI API
-+ */
-+
-+/* ----------------------------------------------------------------------
-+ * return pointer to the mphi message driver function table
-+ * -------------------------------------------------------------------- */
-+const VCHI_MESSAGE_DRIVER_T *
-+vchi_mphi_message_driver_func_table( void )
-+{
-+   return NULL;
-+}
-+
-+/* ----------------------------------------------------------------------
-+ * return a pointer to the 'single' connection driver fops
-+ * -------------------------------------------------------------------- */
-+const VCHI_CONNECTION_API_T *
-+single_get_func_table( void )
-+{
-+   return NULL;
-+}
-+
-+VCHI_CONNECTION_T *
-+vchi_create_connection( const VCHI_CONNECTION_API_T * function_table,
-+   const VCHI_MESSAGE_DRIVER_T * low_level )
-+{
-+   vcos_unused(function_table);
-+   vcos_unused(low_level);
-+
-+   return NULL;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_msg_peek
-+ *
-+ * Arguments:  const VCHI_SERVICE_HANDLE_T handle,
-+ *             void **data,
-+ *             uint32_t *msg_size,
-+ *             VCHI_FLAGS_T flags
-+ *
-+ * Description: Routine to return a pointer to the current message (to allow in place processing)
-+ *              The message can be removed using vchi_msg_remove when you're finished
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_msg_peek( VCHI_SERVICE_HANDLE_T handle,
-+   void **data,
-+   uint32_t *msg_size,
-+   VCHI_FLAGS_T flags )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   ret = fill_peek_buf(service, flags);
-+
-+   if (ret == 0)
-+   {
-+      *data = service->peek_buf;
-+      *msg_size = service->peek_size;
-+   }
-+
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_msg_remove
-+ *
-+ * Arguments:  const VCHI_SERVICE_HANDLE_T handle,
-+ *
-+ * Description: Routine to remove a message (after it has been read with vchi_msg_peek)
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_msg_remove( VCHI_SERVICE_HANDLE_T handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   /* Why would you call vchi_msg_remove without calling vchi_msg_peek first? */
-+   vcos_assert(service->peek_size >= 0);
-+
-+   /* Invalidate the content but reuse the buffer */
-+   service->peek_size = -1;
-+
-+   return 0;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_msg_queue
-+ *
-+ * Arguments:  VCHI_SERVICE_HANDLE_T handle,
-+ *             const void *data,
-+ *             uint32_t data_size,
-+ *             VCHI_FLAGS_T flags,
-+ *             void *msg_handle,
-+ *
-+ * Description: Thin wrapper to queue a message onto a connection
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_msg_queue( VCHI_SERVICE_HANDLE_T handle,
-+   const void * data,
-+   uint32_t data_size,
-+   VCHI_FLAGS_T flags,
-+   void * msg_handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_MESSAGE_T args;
-+   VCHIQ_ELEMENT_T element = {data, data_size};
-+   int ret;
-+
-+   vcos_unused(msg_handle);
-+   vcos_assert(flags == VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.elements = &element;
-+   args.count = 1;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_MESSAGE, &args));
-+
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_bulk_queue_receive
-+ *
-+ * Arguments:  VCHI_BULK_HANDLE_T handle,
-+ *             void *data_dst,
-+ *             const uint32_t data_size,
-+ *             VCHI_FLAGS_T flags
-+ *             void *bulk_handle
-+ *
-+ * Description: Routine to setup a rcv buffer
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_bulk_queue_receive( VCHI_SERVICE_HANDLE_T handle,
-+   void * data_dst,
-+   uint32_t data_size,
-+   VCHI_FLAGS_T flags,
-+   void * bulk_handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_BULK_TRANSFER_T args;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   switch ((int)flags) {
-+   case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE | VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+      args.mode = VCHIQ_BULK_MODE_CALLBACK;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
-+      args.mode = VCHIQ_BULK_MODE_BLOCKING;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+   case VCHI_FLAGS_NONE:
-+      args.mode = VCHIQ_BULK_MODE_NOCALLBACK;
-+      break;
-+   default:
-+      vcos_assert(0);
-+      break;
-+   }
-+
-+   args.handle = service->handle;
-+   args.data = data_dst;
-+   args.size = data_size;
-+   args.userdata = bulk_handle;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_BULK_RECEIVE, &args));
-+
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_bulk_queue_transmit
-+ *
-+ * Arguments:  VCHI_BULK_HANDLE_T handle,
-+ *             const void *data_src,
-+ *             uint32_t data_size,
-+ *             VCHI_FLAGS_T flags,
-+ *             void *bulk_handle
-+ *
-+ * Description: Routine to transmit some data
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_bulk_queue_transmit( VCHI_SERVICE_HANDLE_T handle,
-+   const void * data_src,
-+   uint32_t data_size,
-+   VCHI_FLAGS_T flags,
-+   void * bulk_handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_BULK_TRANSFER_T args;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   switch ((int)flags) {
-+   case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE | VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+      args.mode = VCHIQ_BULK_MODE_CALLBACK;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_DATA_READ:
-+   case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
-+      args.mode = VCHIQ_BULK_MODE_BLOCKING;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+   case VCHI_FLAGS_NONE:
-+      args.mode = VCHIQ_BULK_MODE_NOCALLBACK;
-+      break;
-+   default:
-+      vcos_assert(0);
-+      break;
-+   }
-+
-+   args.handle = service->handle;
-+   args.data = (void *)data_src;
-+   args.size = data_size;
-+   args.userdata = bulk_handle;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_BULK_TRANSMIT, &args));
-+
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_msg_dequeue
-+ *
-+ * Arguments:  VCHI_SERVICE_HANDLE_T handle,
-+ *             void *data,
-+ *             uint32_t max_data_size_to_read,
-+ *             uint32_t *actual_msg_size
-+ *             VCHI_FLAGS_T flags
-+ *
-+ * Description: Routine to dequeue a message into the supplied buffer
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_msg_dequeue( VCHI_SERVICE_HANDLE_T handle,
-+   void *data,
-+   uint32_t max_data_size_to_read,
-+   uint32_t *actual_msg_size,
-+   VCHI_FLAGS_T flags )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   VCHIQ_DEQUEUE_MESSAGE_T args;
-+   int ret;
-+
-+   vcos_assert(flags == VCHI_FLAGS_NONE || flags == VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE);
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   if (service->peek_size >= 0)
-+   {
-+      fprintf(stderr, "vchi_msg_dequeue -> using peek buffer\n");
-+      if ((uint32_t)service->peek_size <= max_data_size_to_read)
-+      {
-+         memcpy(data, service->peek_buf, service->peek_size);
-+         *actual_msg_size = service->peek_size;
-+         /* Invalidate the peek data, but retain the buffer */
-+         service->peek_size = -1;
-+         ret = 0;
-+      }
-+      else
-+      {
-+         ret = -1;
-+      }
-+   }
-+   else
-+   {
-+      args.handle = service->handle;
-+      args.blocking = (flags == VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE);
-+      args.bufsize = max_data_size_to_read;
-+      args.buf = data;
-+      RETRY(ret, ioctl(service->fd, VCHIQ_IOC_DEQUEUE_MESSAGE, &args));
-+      if (ret >= 0)
-+      {
-+         *actual_msg_size = ret;
-+         ret = 0;
-+      }
-+   }
-+
-+   if ((ret < 0) && (errno != EWOULDBLOCK))
-+      fprintf(stderr, "vchi_msg_dequeue -> %d(%d)\n", ret, errno);
-+
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_msg_queuev
-+ *
-+ * Arguments:  VCHI_SERVICE_HANDLE_T handle,
-+ *             const void *data,
-+ *             uint32_t data_size,
-+ *             VCHI_FLAGS_T flags,
-+ *             void *msg_handle
-+ *
-+ * Description: Thin wrapper to queue a message onto a connection
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+
-+vcos_static_assert(sizeof(VCHI_MSG_VECTOR_T) == sizeof(VCHIQ_ELEMENT_T));
-+vcos_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_base) == offsetof(VCHIQ_ELEMENT_T, data));
-+vcos_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_len) == offsetof(VCHIQ_ELEMENT_T, size));
-+
-+int32_t
-+vchi_msg_queuev( VCHI_SERVICE_HANDLE_T handle,
-+   VCHI_MSG_VECTOR_T * vector,
-+   uint32_t count,
-+   VCHI_FLAGS_T flags,
-+   void *msg_handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   VCHIQ_QUEUE_MESSAGE_T args;
-+   int ret;
-+
-+   vcos_unused(msg_handle);
-+
-+   vcos_assert(flags == VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   args.handle = service->handle;
-+   args.elements = (const VCHIQ_ELEMENT_T *)vector;
-+   args.count = count;
-+   RETRY(ret, ioctl(service->fd, VCHIQ_IOC_QUEUE_MESSAGE, &args));
-+
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_held_msg_release
-+ *
-+ * Arguments:  VCHI_HELD_MSG_T *message
-+ *
-+ * Description: Routine to release a held message (after it has been read with vchi_msg_hold)
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_held_msg_release( VCHI_HELD_MSG_T *message )
-+{
-+   int ret = -1;
-+
-+   if (message && message->message && !message->service)
-+   {
-+      free_msgbuf(message->message);
-+      ret = 0;
-+   }
-+
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_msg_hold
-+ *
-+ * Arguments:  VCHI_SERVICE_HANDLE_T handle,
-+ *             void **data,
-+ *             uint32_t *msg_size,
-+ *             VCHI_FLAGS_T flags,
-+ *             VCHI_HELD_MSG_T *message_handle
-+ *
-+ * Description: Routine to return a pointer to the current message (to allow in place processing)
-+ *              The message is dequeued - don't forget to release the message using
-+ *              vchi_held_msg_release when you're finished
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_msg_hold( VCHI_SERVICE_HANDLE_T handle,
-+   void **data,
-+   uint32_t *msg_size,
-+   VCHI_FLAGS_T flags,
-+   VCHI_HELD_MSG_T *message_handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   ret = fill_peek_buf(service, flags);
-+
-+   if (ret == 0)
-+   {
-+      *data = service->peek_buf;
-+      *msg_size = service->peek_size;
-+
-+      message_handle->message = service->peek_buf;
-+      message_handle->service = NULL;
-+
-+      service->peek_size = -1;
-+      service->peek_buf = NULL;
-+   }
-+
-+   return 0;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_initialise
-+ *
-+ * Arguments: VCHI_INSTANCE_T *instance_handle
-+ *            VCHI_CONNECTION_T **connections
-+ *            const uint32_t num_connections
-+ *
-+ * Description: Initialises the hardware but does not transmit anything
-+ *              When run as a Host App this will be called twice hence the need
-+ *              to malloc the state information
-+ *
-+ * Returns: 0 if successful, failure otherwise
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_initialise( VCHI_INSTANCE_T *instance_handle )
-+{
-+   VCHIQ_INSTANCE_T instance;
-+
-+   instance = vchiq_lib_init();
-+
-+   vcos_log_trace( "%s: returning instance handle %p", __func__, instance );
-+
-+   *instance_handle = (VCHI_INSTANCE_T)instance;
-+
-+   return (instance != NULL) ? 0 : -1;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_connect
-+ *
-+ * Arguments: VCHI_CONNECTION_T **connections
-+ *            const uint32_t num_connections
-+ *            VCHI_INSTANCE_T instance_handle )
-+ *
-+ * Description: Starts the command service on each connection,
-+ *              causing INIT messages to be pinged back and forth
-+ *
-+ * Returns: 0 if successful, failure otherwise
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_connect( VCHI_CONNECTION_T **connections,
-+   const uint32_t num_connections,
-+   VCHI_INSTANCE_T instance_handle )
-+{
-+   VCHIQ_STATUS_T status;
-+
-+   vcos_unused(connections);
-+   vcos_unused(num_connections);
-+
-+   status = vchiq_connect((VCHIQ_INSTANCE_T)instance_handle);
-+
-+   return (status == VCHIQ_SUCCESS) ? 0 : -1;
-+}
-+
-+
-+/***********************************************************
-+ * Name: vchi_disconnect
-+ *
-+ * Arguments: VCHI_INSTANCE_T instance_handle
-+ *
-+ * Description: Stops the command service on each connection,
-+ *              causing DE-INIT messages to be pinged back and forth
-+ *
-+ * Returns: 0 if successful, failure otherwise
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_disconnect( VCHI_INSTANCE_T instance_handle )
-+{
-+   VCHIQ_STATUS_T status;
-+   
-+   status = vchiq_shutdown((VCHIQ_INSTANCE_T)instance_handle);
-+
-+   return (status == VCHIQ_SUCCESS) ? 0 : -1;
-+}
-+
-+
-+/***********************************************************
-+ * Name: vchi_service_open
-+ * Name: vchi_service_create
-+ *
-+ * Arguments: VCHI_INSTANCE_T *instance_handle
-+ *            SERVICE_CREATION_T *setup,
-+ *            VCHI_SERVICE_HANDLE_T *handle
-+ *
-+ * Description: Routine to open a service
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_service_open( VCHI_INSTANCE_T instance_handle,
-+   SERVICE_CREATION_T *setup,
-+   VCHI_SERVICE_HANDLE_T *handle )
-+{
-+   VCHIQ_SERVICE_PARAMS_T params;
-+   VCHIQ_STATUS_T status;
-+
-+   memset(&params, 0, sizeof(params));
-+   params.fourcc = setup->service_id;
-+   params.userdata = setup->callback_param;
-+
-+   status = create_service((VCHIQ_INSTANCE_T)instance_handle,
-+      &params,
-+      setup->callback,
-+      1/*open*/,
-+      (VCHIQ_SERVICE_HANDLE_T *)handle);
-+
-+   return (status == VCHIQ_SUCCESS) ? 0 : -1;
-+}
-+
-+int32_t
-+vchi_service_create( VCHI_INSTANCE_T instance_handle,
-+   SERVICE_CREATION_T *setup, VCHI_SERVICE_HANDLE_T *handle )
-+{
-+   VCHIQ_SERVICE_PARAMS_T params;
-+   VCHIQ_STATUS_T status;
-+
-+   memset(&params, 0, sizeof(params));
-+   params.fourcc = setup->service_id;
-+   params.userdata = setup->callback_param;
-+
-+   status = create_service((VCHIQ_INSTANCE_T)instance_handle,
-+      &params,
-+      setup->callback,
-+      0/*!open*/,
-+      (VCHIQ_SERVICE_HANDLE_T *)handle);
-+
-+   return (status == VCHIQ_SUCCESS) ? 0 : -1;
-+}
-+
-+int32_t
-+vchi_service_close( const VCHI_SERVICE_HANDLE_T handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_REMOVE_SERVICE, service->handle));
-+
-+   if (ret == 0)
-+      service->handle = VCHIQ_INVALID_HANDLE;
-+
-+   return ret;
-+}
-+
-+int32_t
-+vchi_service_destroy( const VCHI_SERVICE_HANDLE_T handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_REMOVE_SERVICE, service->handle));
-+
-+   if (ret == 0)
-+      service->handle = VCHIQ_INVALID_HANDLE;
-+
-+   return ret;
-+}
-+
-+/* ----------------------------------------------------------------------
-+ * read a uint32_t from buffer.
-+ * network format is defined to be little endian
-+ * -------------------------------------------------------------------- */
-+uint32_t
-+vchi_readbuf_uint32( const void *_ptr )
-+{
-+   const unsigned char *ptr = _ptr;
-+   return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
-+}
-+
-+/* ----------------------------------------------------------------------
-+ * write a uint32_t to buffer.
-+ * network format is defined to be little endian
-+ * -------------------------------------------------------------------- */
-+void
-+vchi_writebuf_uint32( void *_ptr, uint32_t value )
-+{
-+   unsigned char *ptr = _ptr;
-+   ptr[0] = (unsigned char)((value >> 0)  & 0xFF);
-+   ptr[1] = (unsigned char)((value >> 8)  & 0xFF);
-+   ptr[2] = (unsigned char)((value >> 16) & 0xFF);
-+   ptr[3] = (unsigned char)((value >> 24) & 0xFF);
-+}
-+
-+/* ----------------------------------------------------------------------
-+ * read a uint16_t from buffer.
-+ * network format is defined to be little endian
-+ * -------------------------------------------------------------------- */
-+uint16_t
-+vchi_readbuf_uint16( const void *_ptr )
-+{
-+   const unsigned char *ptr = _ptr;
-+   return ptr[0] | (ptr[1] << 8);
-+}
-+
-+/* ----------------------------------------------------------------------
-+ * write a uint16_t into the buffer.
-+ * network format is defined to be little endian
-+ * -------------------------------------------------------------------- */
-+void
-+vchi_writebuf_uint16( void *_ptr, uint16_t value )
-+{
-+   unsigned char *ptr = _ptr;
-+   ptr[0] = (value >> 0)  & 0xFF;
-+   ptr[1] = (value >> 8)  & 0xFF;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_service_use
-+ *
-+ * Arguments: const VCHI_SERVICE_HANDLE_T handle
-+ *
-+ * Description: Routine to increment refcount on a service
-+ *
-+ * Returns: void
-+ *
-+ ***********************************************************/
-+int32_t
-+vchi_service_use( const VCHI_SERVICE_HANDLE_T handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_USE_SERVICE, service->handle));
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchi_service_release
-+ *
-+ * Arguments: const VCHI_SERVICE_HANDLE_T handle
-+ *
-+ * Description: Routine to decrement refcount on a service
-+ *
-+ * Returns: void
-+ *
-+ ***********************************************************/
-+int32_t vchi_service_release( const VCHI_SERVICE_HANDLE_T handle )
-+{
-+   VCHI_SERVICE_T *service = (VCHI_SERVICE_T *)handle;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_RELEASE_SERVICE, service->handle));
-+   return ret;
-+}
-+
-+/***********************************************************
-+ * Name: vchiq_dump_phys_mem
-+ *
-+ * Arguments: const VCHI_SERVICE_HANDLE_T handle
-+ *            void *buffer
-+ *            size_t num_bytes
-+ *
-+ * Description: Dumps the physical memory associated with
-+ *              a buffer.
-+ *
-+ * Returns: void
-+ *
-+ ***********************************************************/
-+VCHIQ_STATUS_T vchiq_dump_phys_mem( VCHIQ_SERVICE_HANDLE_T handle,
-+                             void *ptr,
-+                             size_t num_bytes )
-+{
-+   VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)handle;
-+   VCHIQ_DUMP_MEM_T  dump_mem;
-+   int ret;
-+
-+   if (!is_valid_service(service))
-+      return VCHIQ_ERROR;
-+
-+   dump_mem.virt_addr = ptr;
-+   dump_mem.num_bytes = num_bytes;
-+
-+   RETRY(ret,ioctl(service->fd, VCHIQ_IOC_DUMP_PHYS_MEM, &dump_mem));
-+   return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR;
-+}
-+
-+
-+
-+/*
-+ * Support functions
-+ */
-+
-+static VCHIQ_INSTANCE_T
-+vchiq_lib_init(void)
-+{
-+   static int mutex_initialised = 0;
-+   static VCOS_MUTEX_T vchiq_lib_mutex;
-+   VCHIQ_INSTANCE_T instance = &vchiq_instance;
-+
-+   vcos_global_lock();
-+   if (!mutex_initialised)
-+   {
-+      vcos_mutex_create(&vchiq_lib_mutex, "vchiq-init");
-+
-+      vcos_log_set_level( &vchiq_lib_log_category, vchiq_default_lib_log_level );
-+      vcos_log_register( "vchiq_lib", &vchiq_lib_log_category );
-+
-+      mutex_initialised = 1;
-+   }
-+   vcos_global_unlock();
-+
-+   vcos_mutex_lock(&vchiq_lib_mutex);
-+
-+   if (instance->initialised == 0)
-+   {
-+      instance->fd = open("/dev/vchiq", O_RDWR);
-+      if (instance->fd >= 0)
-+      {
-+         VCHIQ_GET_CONFIG_T args;
-+         VCHIQ_CONFIG_T config;
-+         int ret;
-+         args.config_size = sizeof(config);
-+         args.pconfig = &config;
-+         RETRY(ret, ioctl(instance->fd, VCHIQ_IOC_GET_CONFIG, &args));
-+         if ((ret == 0) && (config.version >= VCHIQ_VERSION_MIN) && (config.version_min <= VCHIQ_VERSION))
-+         {
-+            instance->used_services = 0;
-+            vcos_mutex_create(&instance->mutex, "VCHIQ instance");
-+            instance->initialised = 1;
-+         }
-+         else
-+         {
-+            if (ret == 0)
-+            {
-+               vcos_log_error("Incompatible VCHIQ library - driver version %d (min %d), library version %d (min %d)",
-+                  config.version, config.version_min, VCHIQ_VERSION, VCHIQ_VERSION_MIN);
-+            }
-+            else
-+            {
-+               vcos_log_error("Very incompatible VCHIQ library - cannot retrieve driver version");
-+            }
-+            close(instance->fd);
-+            instance = NULL;
-+         }
-+      }
-+      else
-+      {
-+         instance = NULL;
-+      }
-+   }
-+   else if (instance->initialised > 0)
-+   {
-+      instance->initialised++;
-+   }
-+
-+   vcos_mutex_unlock(&vchiq_lib_mutex);
-+
-+   return instance;
-+}
-+
-+static void *
-+completion_thread(void *arg)
-+{
-+   VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)arg;
-+   VCHIQ_AWAIT_COMPLETION_T args;
-+   VCHIQ_COMPLETION_DATA_T completions[8];
-+   void *msgbufs[8];
-+
-+   static const VCHI_CALLBACK_REASON_T vchiq_reason_to_vchi[] =
-+   {
-+      VCHI_CALLBACK_SERVICE_OPENED,        // VCHIQ_SERVICE_OPENED
-+      VCHI_CALLBACK_SERVICE_CLOSED,        // VCHIQ_SERVICE_CLOSED
-+      VCHI_CALLBACK_MSG_AVAILABLE,         // VCHIQ_MESSAGE_AVAILABLE
-+      VCHI_CALLBACK_BULK_SENT,             // VCHIQ_BULK_TRANSMIT_DONE
-+      VCHI_CALLBACK_BULK_RECEIVED,         // VCHIQ_BULK_RECEIVE_DONE
-+      VCHI_CALLBACK_BULK_TRANSMIT_ABORTED, // VCHIQ_BULK_TRANSMIT_ABORTED
-+      VCHI_CALLBACK_BULK_RECEIVE_ABORTED,  // VCHIQ_BULK_RECEIVE_ABORTED
-+   };
-+
-+   args.count = vcos_countof(completions);
-+   args.buf = completions;
-+   args.msgbufsize = MSGBUF_SIZE;
-+   args.msgbufcount = 0;
-+   args.msgbufs = msgbufs;
-+
-+   while (1)
-+   {
-+      int ret, i;
-+
-+      while ((unsigned int)args.msgbufcount < vcos_countof(msgbufs))
-+      {
-+         void *msgbuf = alloc_msgbuf();
-+         if (msgbuf)
-+         {
-+            msgbufs[args.msgbufcount++] = msgbuf;
-+         }
-+         else
-+         {
-+            fprintf(stderr, "vchiq_lib: failed to allocate a message buffer\n");
-+            vcos_demand(args.msgbufcount != 0);
-+         }
-+      }
-+
-+      RETRY(ret, ioctl(instance->fd, VCHIQ_IOC_AWAIT_COMPLETION, &args));
-+
-+      if (ret <= 0)
-+         break;
-+
-+      for (i = 0; i < ret; i++)
-+      {
-+         VCHIQ_COMPLETION_DATA_T *completion = &completions[i];
-+         VCHIQ_SERVICE_T *service = (VCHIQ_SERVICE_T *)completion->service_userdata;
-+         if (service->base.callback)
-+         {
-+            vcos_log_trace( "callback(%x, %x, %x, %x)",
-+               completion->reason, (uint32_t)completion->header,
-+               (uint32_t)&service->base, (uint32_t)completion->bulk_userdata );
-+            service->base.callback(completion->reason, completion->header,
-+               &service->base, completion->bulk_userdata);
-+         }
-+         else if (service->vchi_callback)
-+         {
-+            VCHI_CALLBACK_REASON_T vchi_reason =
-+               vchiq_reason_to_vchi[completion->reason];
-+            service->vchi_callback(service->base.userdata, vchi_reason, completion->bulk_userdata);
-+         }
-+      }
-+   }
-+   return NULL;
-+}
-+
-+static VCHIQ_STATUS_T
-+create_service(VCHIQ_INSTANCE_T instance,
-+   const VCHIQ_SERVICE_PARAMS_T *params,
-+   VCHI_CALLBACK_T vchi_callback,
-+   int is_open,
-+   VCHIQ_SERVICE_HANDLE_T *pservice)
-+{
-+   VCHIQ_SERVICE_T *service = NULL;
-+   VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
-+   int i;
-+
-+   if (!is_valid_instance(instance))
-+      return VCHIQ_ERROR;
-+
-+   vcos_mutex_lock(&instance->mutex);
-+
-+   /* Find a free service */
-+   if (is_open)
-+   {
-+      /* Find a free service */
-+      for (i = 0; i < instance->used_services; i++)
-+      {
-+         if (instance->services[i].handle == VCHIQ_INVALID_HANDLE)
-+         {
-+            service = &instance->services[i];
-+            break;
-+         }
-+      }
-+   }
-+   else
-+   {
-+      for (i = (instance->used_services - 1); i >= 0; i--)
-+      {
-+         VCHIQ_SERVICE_T *srv = &instance->services[i];
-+         if (srv->handle == VCHIQ_INVALID_HANDLE)
-+         {
-+            service = srv;
-+         }
-+         else if (
-+            (srv->base.fourcc == params->fourcc) &&
-+            ((srv->base.callback != params->callback) ||
-+            (srv->vchi_callback != vchi_callback)))
-+         {
-+            /* There is another server using this fourcc which doesn't match */
-+            service = NULL;
-+            status = VCHIQ_ERROR;
-+            break;
-+         }
-+      }
-+   }
-+
-+   if (!service && (status == VCHIQ_SUCCESS) &&
-+      (instance->used_services < VCHIQ_MAX_INSTANCE_SERVICES))
-+      service = &instance->services[instance->used_services++];
-+
-+   if (service)
-+   {
-+      VCHIQ_CREATE_SERVICE_T args;
-+      int ret;
-+      service->base.fourcc = params->fourcc;
-+      service->base.callback = params->callback;
-+      service->vchi_callback = vchi_callback;
-+      service->base.userdata = params->userdata;
-+      service->fd = instance->fd;
-+      service->peek_size = -1;
-+      service->peek_buf = NULL;
-+
-+      args.params = *params;
-+      args.params.userdata = service;
-+      args.is_open = is_open;
-+      args.is_vchi = (params->callback == NULL);
-+      args.handle = -1; /* OUT parameter */
-+      RETRY(ret, ioctl(instance->fd, VCHIQ_IOC_CREATE_SERVICE, &args));
-+      if (ret == 0)
-+         service->handle = args.handle;
-+      else
-+         status = VCHIQ_ERROR;
-+   }
-+
-+   *pservice = (status == VCHIQ_SUCCESS) ? &service->base : NULL;
-+
-+   vcos_mutex_unlock(&instance->mutex);
-+
-+   return status;
-+}
-+
-+static int
-+fill_peek_buf(VCHI_SERVICE_T *service,
-+   VCHI_FLAGS_T flags)
-+{
-+   VCHIQ_DEQUEUE_MESSAGE_T args;
-+   int ret = 0;
-+
-+   vcos_assert(flags == VCHI_FLAGS_NONE || flags == VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE);
-+
-+   if (service->peek_size < 0)
-+   {
-+      if (!service->peek_buf)
-+         service->peek_buf = alloc_msgbuf();
-+
-+      if (service->peek_buf)
-+      {
-+         args.handle = service->handle;
-+         args.blocking = (flags == VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE);
-+         args.bufsize = MSGBUF_SIZE;
-+         args.buf = service->peek_buf;
-+
-+         RETRY(ret, ioctl(service->fd, VCHIQ_IOC_DEQUEUE_MESSAGE, &args));
-+
-+         if (ret >= 0)
-+         {
-+            service->peek_size = ret;
-+            ret = 0;
-+         }
-+         else
-+         {
-+            ret = -1;
-+         }
-+      }
-+      else
-+      {
-+         ret = -1;
-+      }
-+   }
-+
-+   return ret;
-+}
-+
-+
-+static void *
-+alloc_msgbuf(void)
-+{
-+   void *msgbuf;
-+   vcos_mutex_lock(&vchiq_lib_mutex);
-+   msgbuf = free_msgbufs;
-+   if (msgbuf)
-+      free_msgbufs = *(void **)msgbuf;
-+   vcos_mutex_unlock(&vchiq_lib_mutex);
-+   if (!msgbuf)
-+      msgbuf = malloc(MSGBUF_SIZE);
-+   return msgbuf;
-+}
-+
-+static void
-+free_msgbuf(void *buf)
-+{
-+   vcos_mutex_lock(&vchiq_lib_mutex);
-+   *(void **)buf = free_msgbufs;
-+   free_msgbufs = buf;
-+   vcos_mutex_unlock(&vchiq_lib_mutex);
-+}
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h	2012-10-21 15:15:10.017260066 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h	2012-10-17 18:57:47.000000000 +0200
-@@ -22,31 +22,24 @@
- 
- /* ---- Constants and Types ---------------------------------------------- */
- 
--typedef struct {
--	 void                   *armSharedMemVirt;
--	 dma_addr_t              armSharedMemPhys;
--	 size_t                  armSharedMemSize;
--
--	 void                   *vcSharedMemVirt;
--	 dma_addr_t              vcSharedMemPhys;
--	 size_t                  vcSharedMemSize;
-+typedef struct
-+{
-+    void                   *armSharedMemVirt;
-+    dma_addr_t              armSharedMemPhys;
-+    size_t                  armSharedMemSize;
-+
-+    void                   *vcSharedMemVirt;
-+    dma_addr_t              vcSharedMemPhys;
-+    size_t                  vcSharedMemSize;
-+
- } VCHIQ_SHARED_MEM_INFO_T;
- 
- /* ---- Variable Externs ------------------------------------------------- */
- 
- /* ---- Function Prototypes ---------------------------------------------- */
- 
--void vchiq_get_shared_mem_info(VCHIQ_SHARED_MEM_INFO_T *info);
-+void vchiq_get_shared_mem_info( VCHIQ_SHARED_MEM_INFO_T *info );
- 
- VCHIQ_STATUS_T vchiq_memdrv_initialise(void);
- 
--VCHIQ_STATUS_T vchiq_userdrv_create_instance(
--	const VCHIQ_PLATFORM_DATA_T * platform_data);
--
--VCHIQ_STATUS_T vchiq_userdrv_suspend(
--	const VCHIQ_PLATFORM_DATA_T * platform_data);
--
--VCHIQ_STATUS_T vchiq_userdrv_resume(
--	const VCHIQ_PLATFORM_DATA_T * platform_data);
--
- #endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c	2012-10-21 15:15:10.018260086 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,223 +0,0 @@
--/*
-- * Copyright (c) 2012 Broadcom Corporation. All rights reserved.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-- */
--
--
--#include <linux/proc_fs.h>
--#include "vchiq_core.h"
--#include "vchiq_arm.h"
--
--struct vchiq_proc_info {
--	/* Global 'vc' proc entry used by all instances */
--	struct proc_dir_entry *vc_cfg_dir;
--
--	/* one entry per client process */
--	struct proc_dir_entry *clients;
--
--	/* log categories */
--	struct proc_dir_entry *log_categories;
--};
--
--static struct vchiq_proc_info proc_info;
--
--struct proc_dir_entry *vchiq_proc_top(void)
--{
--	BUG_ON(proc_info.vc_cfg_dir == NULL);
--	return proc_info.vc_cfg_dir;
--}
--
--/****************************************************************************
--*
--*   log category entries
--*
--***************************************************************************/
--#define PROC_WRITE_BUF_SIZE 256
--
--#define VCHIQ_LOG_ERROR_STR   "error"
--#define VCHIQ_LOG_WARNING_STR "warning"
--#define VCHIQ_LOG_INFO_STR    "info"
--#define VCHIQ_LOG_TRACE_STR   "trace"
--
--static int log_cfg_read(char *buffer,
--	char **start,
--	off_t off,
--	int count,
--	int *eof,
--	void *data)
--{
--	int len = 0;
--	char *log_value = NULL;
--
--	switch (*((int *)data)) {
--	case VCHIQ_LOG_ERROR:
--		log_value = VCHIQ_LOG_ERROR_STR;
--		break;
--	case VCHIQ_LOG_WARNING:
--		log_value = VCHIQ_LOG_WARNING_STR;
--		break;
--	case VCHIQ_LOG_INFO:
--		log_value = VCHIQ_LOG_INFO_STR;
--		break;
--	case VCHIQ_LOG_TRACE:
--		log_value = VCHIQ_LOG_TRACE_STR;
--		break;
--	default:
--		break;
--	}
--
--	len += sprintf(buffer + len,
--		"%s\n",
--		log_value ? log_value : "(null)");
--
--	return len;
--}
--
--
--static int log_cfg_write(struct file *file,
--	const char __user *buffer,
--	unsigned long count,
--	void *data)
--{
--	int *log_module = data;
--	char kbuf[PROC_WRITE_BUF_SIZE + 1];
--
--	(void)file;
--
--	memset(kbuf, 0, PROC_WRITE_BUF_SIZE + 1);
--	if (count >= PROC_WRITE_BUF_SIZE)
--		count = PROC_WRITE_BUF_SIZE;
--
--	if (copy_from_user(kbuf,
--		buffer,
--		count) != 0)
--		return -EFAULT;
--	kbuf[count - 1] = 0;
--
--	if (strncmp("error", kbuf, strlen("error")) == 0)
--		*log_module = VCHIQ_LOG_ERROR;
--	else if (strncmp("warning", kbuf, strlen("warning")) == 0)
--		*log_module = VCHIQ_LOG_WARNING;
--	else if (strncmp("info", kbuf, strlen("info")) == 0)
--		*log_module = VCHIQ_LOG_INFO;
--	else if (strncmp("trace", kbuf, strlen("trace")) == 0)
--		*log_module = VCHIQ_LOG_TRACE;
--	else
--		*log_module = VCHIQ_LOG_DEFAULT;
--
--	return count;
--}
--
--/* Log category proc entries */
--struct vchiq_proc_log_entry {
--	const char *name;
--	int *plevel;
--	struct proc_dir_entry *dir;
--};
--
--static struct vchiq_proc_log_entry vchiq_proc_log_entries[] = {
--	{ "core", &vchiq_core_log_level },
--	{ "msg",  &vchiq_core_msg_log_level },
--	{ "sync", &vchiq_sync_log_level },
--	{ "arm",  &vchiq_arm_log_level },
--};
--static int n_log_entries =
--	sizeof(vchiq_proc_log_entries)/sizeof(vchiq_proc_log_entries[0]);
--
--/* create an entry under /proc/vc/log for each log category */
--static int vchiq_proc_create_log_entries(struct proc_dir_entry *top)
--{
--	struct proc_dir_entry *dir;
--	size_t i;
--	int ret = 0;
--
--	dir = proc_mkdir("log", proc_info.vc_cfg_dir);
--	if (!dir)
--		return -ENOMEM;
--	proc_info.log_categories = dir;
--
--	for (i = 0; i < n_log_entries; i++) {
--		dir = create_proc_entry(vchiq_proc_log_entries[i].name,
--					0644,
--					proc_info.log_categories);
--		if (!dir) {
--			ret = -ENOMEM;
--			break;
--		}
--
--		dir->read_proc = &log_cfg_read;
--		dir->write_proc = &log_cfg_write;
--		dir->data = (void *)vchiq_proc_log_entries[i].plevel;
--
--		vchiq_proc_log_entries[i].dir = dir;
--	}
--	return ret;
--}
--
--
--int vchiq_proc_init(void)
--{
--	BUG_ON(proc_info.vc_cfg_dir != NULL);
--
--	proc_info.vc_cfg_dir = proc_mkdir("vc", NULL);
--	if (proc_info.vc_cfg_dir == NULL)
--		goto fail;
--
--	proc_info.clients = proc_mkdir("clients",
--				proc_info.vc_cfg_dir);
--	if (!proc_info.clients)
--		goto fail;
--
--	if (vchiq_proc_create_log_entries(proc_info.vc_cfg_dir) != 0)
--		goto fail;
--
--	return 0;
--
--fail:
--	vchiq_proc_deinit();
--	vchiq_log_error(vchiq_arm_log_level,
--		"%s: failed to create proc directory",
--		__func__);
--
--	return -ENOMEM;
--}
--
--/* remove all the proc entries */
--void vchiq_proc_deinit(void)
--{
--	/* log category entries */
--	if (proc_info.log_categories) {
--		size_t i;
--		for (i = 0; i < n_log_entries; i++)
--			if (vchiq_proc_log_entries[i].dir)
--				remove_proc_entry(
--					vchiq_proc_log_entries[i].name,
--					proc_info.log_categories);
--
--		remove_proc_entry(proc_info.log_categories->name,
--				  proc_info.vc_cfg_dir);
--	}
--	if (proc_info.clients)
--		remove_proc_entry(proc_info.clients->name,
--				  proc_info.vc_cfg_dir);
--	if (proc_info.vc_cfg_dir)
--		remove_proc_entry(proc_info.vc_cfg_dir->name, NULL);
--}
--
--struct proc_dir_entry *vchiq_clients_top(void)
--{
--	return proc_info.clients;
--}
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c	2012-10-21 15:15:10.020260125 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c	2012-10-17 18:57:47.000000000 +0200
-@@ -15,8 +15,6 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
--#include <linux/module.h>
--#include <linux/types.h>
- 
- #include "interface/vchi/vchi.h"
- #include "vchiq.h"
-@@ -26,42 +24,56 @@
- 
- #include <stddef.h>
- 
-+#if defined(__KERNEL__)
-+#include <linux/module.h>
-+#endif
-+
- #define vchiq_status_to_vchi(status) ((int32_t)status)
- 
- typedef struct {
--	VCHIQ_SERVICE_HANDLE_T handle;
-+   VCHIQ_SERVICE_HANDLE_T handle;
- 
--	VCHIU_QUEUE_T queue;
-+   VCHIU_QUEUE_T queue;
- 
--	VCHI_CALLBACK_T callback;
--	void *callback_param;
-+   VCHI_CALLBACK_T callback;
-+   void *callback_param;
- } SHIM_SERVICE_T;
- 
- /* ----------------------------------------------------------------------
-  * return pointer to the mphi message driver function table
-  * -------------------------------------------------------------------- */
-+#ifdef WIN32
- const VCHI_MESSAGE_DRIVER_T *
--vchi_mphi_message_driver_func_table(void)
-+mphi_get_func_table( void )
- {
--	return NULL;
-+   return NULL;
-+}
-+#endif
-+
-+/* ----------------------------------------------------------------------
-+ * return pointer to the mphi message driver function table
-+ * -------------------------------------------------------------------- */
-+const VCHI_MESSAGE_DRIVER_T *
-+vchi_mphi_message_driver_func_table( void )
-+{
-+   return NULL;
- }
- 
- /* ----------------------------------------------------------------------
-  * return a pointer to the 'single' connection driver fops
-  * -------------------------------------------------------------------- */
- const VCHI_CONNECTION_API_T *
--single_get_func_table(void)
-+single_get_func_table( void )
- {
--	return NULL;
-+   return NULL;
- }
- 
--VCHI_CONNECTION_T *vchi_create_connection(
--	const VCHI_CONNECTION_API_T *function_table,
--	const VCHI_MESSAGE_DRIVER_T *low_level)
-+VCHI_CONNECTION_T * vchi_create_connection( const VCHI_CONNECTION_API_T * function_table,
-+                                            const VCHI_MESSAGE_DRIVER_T * low_level)
- {
--	(void)function_table;
--	(void)low_level;
--	return NULL;
-+   vcos_unused(function_table);
-+   vcos_unused(low_level);
-+   return NULL;
- }
- 
- /***********************************************************
-@@ -70,64 +82,57 @@
-  * Arguments:  const VCHI_SERVICE_HANDLE_T handle,
-  *             void **data,
-  *             uint32_t *msg_size,
--
--
-  *             VCHI_FLAGS_T flags
-  *
-- * Description: Routine to return a pointer to the current message (to allow in
-- *              place processing). The message can be removed using
-- *              vchi_msg_remove when you're finished
-+ * Description: Routine to return a pointer to the current message (to allow in place processing)
-+ *              The message can be removed using vchi_msg_remove when you're finished
-  *
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle,
--	void **data,
--	uint32_t *msg_size,
--	VCHI_FLAGS_T flags)
-+int32_t vchi_msg_peek( VCHI_SERVICE_HANDLE_T handle,
-+                       void **data,
-+                       uint32_t *msg_size,
-+                       VCHI_FLAGS_T flags )
- {
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	VCHIQ_HEADER_T *header;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_HEADER_T *header;
- 
--	WARN_ON((flags != VCHI_FLAGS_NONE) &&
--		(flags != VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE));
-+   vcos_assert(flags == VCHI_FLAGS_NONE || flags == VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE);
- 
--	if (flags == VCHI_FLAGS_NONE)
--		if (vchiu_queue_is_empty(&service->queue))
--			return -1;
-+   if (flags == VCHI_FLAGS_NONE)
-+      if (vchiu_queue_is_empty(&service->queue))
-+         return -1;
- 
--	header = vchiu_queue_peek(&service->queue);
-+   header = vchiu_queue_peek(&service->queue);
- 
--	*data = header->data;
--	*msg_size = header->size;
-+   *data = header->data;
-+   *msg_size = header->size;
- 
--	return 0;
-+   return 0;
- }
--EXPORT_SYMBOL(vchi_msg_peek);
- 
- /***********************************************************
-  * Name: vchi_msg_remove
-  *
-  * Arguments:  const VCHI_SERVICE_HANDLE_T handle,
-  *
-- * Description: Routine to remove a message (after it has been read with
-- *              vchi_msg_peek)
-+ * Description: Routine to remove a message (after it has been read with vchi_msg_peek)
-  *
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_msg_remove(VCHI_SERVICE_HANDLE_T handle)
-+int32_t vchi_msg_remove( VCHI_SERVICE_HANDLE_T handle )
- {
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	VCHIQ_HEADER_T *header;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_HEADER_T *header;
- 
--	header = vchiu_queue_pop(&service->queue);
-+   header = vchiu_queue_pop(&service->queue);
- 
--	vchiq_release_message(service->handle, header);
-+   vchiq_release_message(service->handle, header);
- 
--	return 0;
-+   return 0;
- }
--EXPORT_SYMBOL(vchi_msg_remove);
- 
- /***********************************************************
-  * Name: vchi_msg_queue
-@@ -143,34 +148,33 @@
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
--	const void *data,
--	uint32_t data_size,
--	VCHI_FLAGS_T flags,
--	void *msg_handle)
--{
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	VCHIQ_ELEMENT_T element = {data, data_size};
--	VCHIQ_STATUS_T status;
--
--	(void)msg_handle;
--
--	WARN_ON(flags != VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
--
--	status = vchiq_queue_message(service->handle, &element, 1);
--
--	/* vchiq_queue_message() may return VCHIQ_RETRY, so we need to
--	** implement a retry mechanism since this function is supposed
--	** to block until queued
--	*/
--	while (status == VCHIQ_RETRY) {
--		msleep(1);
--		status = vchiq_queue_message(service->handle, &element, 1);
--	}
-+int32_t vchi_msg_queue( VCHI_SERVICE_HANDLE_T handle,
-+                        const void * data,
-+                        uint32_t data_size,
-+                        VCHI_FLAGS_T flags,
-+                        void * msg_handle )
-+{
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_ELEMENT_T element = {data, data_size};
-+   VCHIQ_STATUS_T status;
-+
-+   vcos_unused(msg_handle);
-+
-+   vcos_assert(flags == VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
-+
-+   status = vchiq_queue_message(service->handle, &element, 1);
-+
-+   // On some platforms, like linux kernel, vchiq_queue_message() may return
-+   // VCHIQ_RETRY, so we need to implment a retry mechanism since this
-+   // function is supposed to block until queued
-+   while ( status == VCHIQ_RETRY )
-+   {
-+      vcos_sleep( 1 );
-+      status = vchiq_queue_message(service->handle, &element, 1);
-+   }
- 
--	return vchiq_status_to_vchi(status);
-+   return vchiq_status_to_vchi(status);
- }
--EXPORT_SYMBOL(vchi_msg_queue);
- 
- /***********************************************************
-  * Name: vchi_bulk_queue_receive
-@@ -186,50 +190,107 @@
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle,
--	void *data_dst,
--	uint32_t data_size,
--	VCHI_FLAGS_T flags,
--	void *bulk_handle)
--{
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	VCHIQ_BULK_MODE_T mode;
--	VCHIQ_STATUS_T status;
--
--	switch ((int)flags) {
--	case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
--		| VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
--		WARN_ON(!service->callback);
--		mode = VCHIQ_BULK_MODE_CALLBACK;
--		break;
--	case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
--		mode = VCHIQ_BULK_MODE_BLOCKING;
--		break;
--	case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
--	case VCHI_FLAGS_NONE:
--		mode = VCHIQ_BULK_MODE_NOCALLBACK;
--		break;
--	default:
--		WARN(1, "unsupported message\n");
--		return vchiq_status_to_vchi(VCHIQ_ERROR);
--	}
--
--	status = vchiq_bulk_receive(service->handle, data_dst, data_size,
--		bulk_handle, mode);
--
--	/* vchiq_bulk_receive() may return VCHIQ_RETRY, so we need to
--	** implement a retry mechanism since this function is supposed
--	** to block until queued
--	*/
--	while (status == VCHIQ_RETRY) {
--		msleep(1);
--		status = vchiq_bulk_receive(service->handle, data_dst,
--			data_size, bulk_handle, mode);
--	}
-+int32_t vchi_bulk_queue_receive( VCHI_SERVICE_HANDLE_T handle,
-+                                 void * data_dst,
-+                                 uint32_t data_size,
-+                                 VCHI_FLAGS_T flags,
-+                                 void * bulk_handle )
-+{
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_BULK_MODE_T mode;
-+   VCHIQ_STATUS_T status;
-+
-+   switch ((int)flags) {
-+   case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE | VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+      vcos_assert(service->callback);
-+      mode = VCHIQ_BULK_MODE_CALLBACK;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
-+      mode = VCHIQ_BULK_MODE_BLOCKING;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+   case VCHI_FLAGS_NONE:
-+      mode = VCHIQ_BULK_MODE_NOCALLBACK;
-+      break;
-+   default:
-+      vcos_assert(0);
-+      return vchiq_status_to_vchi(VCHIQ_ERROR);
-+   }
-+
-+   status = vchiq_bulk_receive(service->handle, data_dst, data_size,
-+      bulk_handle, mode);
-+
-+   // On some platforms, like linux kernel, vchiq_bulk_receive() may return
-+   // VCHIQ_RETRY, so we need to implment a retry mechanism since this
-+   // function is supposed to block until queued
-+   while ( status == VCHIQ_RETRY )
-+   {
-+      vcos_sleep( 1 );
-+      status = vchiq_bulk_receive(service->handle, data_dst, data_size,
-+         bulk_handle, mode);
-+   }
-+
-+   return vchiq_status_to_vchi(status);
-+}
-+
-+/***********************************************************
-+ * Name: vchi_bulk_queue_receive_reloc
-+ *
-+ * Arguments:  VCHI_BULK_HANDLE_T handle,
-+ *             VCHI_MEM_HANDLE_T h
-+ *             uint32_t offset
-+ *             const uint32_t data_size,
-+ *             VCHI_FLAGS_T flags
-+ *             void *bulk_handle
-+ *
-+ * Description: Routine to setup a relocatable rcv buffer
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t vchi_bulk_queue_receive_reloc( const VCHI_SERVICE_HANDLE_T handle,
-+                                       VCHI_MEM_HANDLE_T h,
-+                                       uint32_t offset,
-+                                       uint32_t data_size,
-+                                       const VCHI_FLAGS_T flags,
-+                                       void * const bulk_handle )
-+{
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_BULK_MODE_T mode;
-+   VCHIQ_STATUS_T status;
-+
-+   switch ((int)flags) {
-+   case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE | VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+      vcos_assert(service->callback);
-+      mode = VCHIQ_BULK_MODE_CALLBACK;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
-+      mode = VCHIQ_BULK_MODE_BLOCKING;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+   case VCHI_FLAGS_NONE:
-+      mode = VCHIQ_BULK_MODE_NOCALLBACK;
-+      break;
-+   default:
-+      vcos_assert(0);
-+      return vchiq_status_to_vchi(VCHIQ_ERROR);
-+   }
-+
-+   status = vchiq_bulk_receive_handle(service->handle, h, (void*)offset,
-+      data_size, bulk_handle, mode);
-+
-+   // On some platforms, like linux kernel, vchiq_bulk_receive_handle() may
-+   // return VCHIQ_RETRY, so we need to implment a retry mechanism since
-+   // this function is supposed to block until queued
-+   while ( status == VCHIQ_RETRY )
-+   {
-+      vcos_sleep( 1 );
-+      status = vchiq_bulk_receive_handle(service->handle, h, (void*)offset,
-+         data_size, bulk_handle, mode);
-+   }
- 
--	return vchiq_status_to_vchi(status);
-+   return vchiq_status_to_vchi(status);
- }
--EXPORT_SYMBOL(vchi_bulk_queue_receive);
- 
- /***********************************************************
-  * Name: vchi_bulk_queue_transmit
-@@ -245,51 +306,110 @@
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,
--	const void *data_src,
--	uint32_t data_size,
--	VCHI_FLAGS_T flags,
--	void *bulk_handle)
--{
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	VCHIQ_BULK_MODE_T mode;
--	VCHIQ_STATUS_T status;
--
--	switch ((int)flags) {
--	case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
--		| VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
--		WARN_ON(!service->callback);
--		mode = VCHIQ_BULK_MODE_CALLBACK;
--		break;
--	case VCHI_FLAGS_BLOCK_UNTIL_DATA_READ:
--	case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
--		mode = VCHIQ_BULK_MODE_BLOCKING;
--		break;
--	case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
--	case VCHI_FLAGS_NONE:
--		mode = VCHIQ_BULK_MODE_NOCALLBACK;
--		break;
--	default:
--		WARN(1, "unsupported message\n");
--		return vchiq_status_to_vchi(VCHIQ_ERROR);
--	}
--
--	status = vchiq_bulk_transmit(service->handle, data_src, data_size,
--		bulk_handle, mode);
--
--	/* vchiq_bulk_transmit() may return VCHIQ_RETRY, so we need to
--	** implement a retry mechanism since this function is supposed
--	** to block until queued
--	*/
--	while (status == VCHIQ_RETRY) {
--		msleep(1);
--		status = vchiq_bulk_transmit(service->handle, data_src,
--			data_size, bulk_handle, mode);
--	}
-+int32_t vchi_bulk_queue_transmit( VCHI_SERVICE_HANDLE_T handle,
-+                                  const void * data_src,
-+                                  uint32_t data_size,
-+                                  VCHI_FLAGS_T flags,
-+                                  void * bulk_handle )
-+{
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_BULK_MODE_T mode;
-+   VCHIQ_STATUS_T status;
-+
-+   switch ((int)flags) {
-+   case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE | VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+      vcos_assert(service->callback);
-+      mode = VCHIQ_BULK_MODE_CALLBACK;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_DATA_READ:
-+   case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
-+      mode = VCHIQ_BULK_MODE_BLOCKING;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+   case VCHI_FLAGS_NONE:
-+      mode = VCHIQ_BULK_MODE_NOCALLBACK;
-+      break;
-+   default:
-+      vcos_assert(0);
-+      return vchiq_status_to_vchi(VCHIQ_ERROR);
-+   }
-+
-+   status = vchiq_bulk_transmit(service->handle, data_src, data_size,
-+      bulk_handle, mode);
-+
-+   // On some platforms, like linux kernel, vchiq_bulk_transmit() may return
-+   // VCHIQ_RETRY, so we need to implment a retry mechanism since this
-+   // function is supposed to block until queued
-+   while ( status == VCHIQ_RETRY )
-+   {
-+      vcos_sleep( 1 );
-+      status = vchiq_bulk_transmit(service->handle, data_src, data_size,
-+         bulk_handle, mode);
-+   }
- 
--	return vchiq_status_to_vchi(status);
-+   return vchiq_status_to_vchi(status);
-+}
-+
-+/***********************************************************
-+ * Name: vchi_bulk_queue_transmit_reloc
-+ *
-+ * Arguments:  VCHI_BULK_HANDLE_T handle,
-+ *             VCHI_MEM_HANDLE_T h_src,
-+ *             uint32_t offset,
-+ *             uint32_t data_size,
-+ *             VCHI_FLAGS_T flags,
-+ *             void *bulk_handle
-+ *
-+ * Description: Routine to transmit some data from a relocatable buffer
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+
-+int32_t vchi_bulk_queue_transmit_reloc( VCHI_SERVICE_HANDLE_T handle,
-+                                        VCHI_MEM_HANDLE_T h_src,
-+                                        uint32_t offset,
-+                                        uint32_t data_size,
-+                                        VCHI_FLAGS_T flags,
-+                                        void * const bulk_handle )
-+{
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_BULK_MODE_T mode;
-+   VCHIQ_STATUS_T status;
-+
-+   switch ((int)flags) {
-+   case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE | VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+      vcos_assert(service->callback);
-+      mode = VCHIQ_BULK_MODE_CALLBACK;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_DATA_READ:
-+   case VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE:
-+      mode = VCHIQ_BULK_MODE_BLOCKING;
-+      break;
-+   case VCHI_FLAGS_BLOCK_UNTIL_QUEUED:
-+   case VCHI_FLAGS_NONE:
-+      mode = VCHIQ_BULK_MODE_NOCALLBACK;
-+      break;
-+   default:
-+      vcos_assert(0);
-+      return vchiq_status_to_vchi(VCHIQ_ERROR);
-+   }
-+
-+   status = vchiq_bulk_transmit_handle(service->handle, h_src, (void*)offset,
-+      data_size, bulk_handle, mode);
-+
-+   // On some platforms, like linux kernel, vchiq_bulk_transmit_handle() may
-+   // return VCHIQ_RETRY, so we need to implment a retry mechanism since this
-+   // function is supposed to block until queued
-+   while ( status == VCHIQ_RETRY )
-+   {
-+      vcos_sleep( 1 );
-+      status = vchiq_bulk_transmit_handle(service->handle, h_src, (void*)offset,
-+         data_size, bulk_handle, mode);
-+   }
-+
-+   return vchiq_status_to_vchi(status);
- }
--EXPORT_SYMBOL(vchi_bulk_queue_transmit);
- 
- /***********************************************************
-  * Name: vchi_msg_dequeue
-@@ -305,41 +425,38 @@
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle,
--	void *data,
--	uint32_t max_data_size_to_read,
--	uint32_t *actual_msg_size,
--	VCHI_FLAGS_T flags)
-+int32_t vchi_msg_dequeue( VCHI_SERVICE_HANDLE_T handle,
-+                          void *data,
-+                          uint32_t max_data_size_to_read,
-+                          uint32_t *actual_msg_size,
-+                          VCHI_FLAGS_T flags )
- {
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	VCHIQ_HEADER_T *header;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_HEADER_T *header;
- 
--	WARN_ON((flags != VCHI_FLAGS_NONE) &&
--		(flags != VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE));
-+   vcos_assert(flags == VCHI_FLAGS_NONE || flags == VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE);
- 
--	if (flags == VCHI_FLAGS_NONE)
--		if (vchiu_queue_is_empty(&service->queue))
--			return -1;
-+   if (flags == VCHI_FLAGS_NONE)
-+      if (vchiu_queue_is_empty(&service->queue))
-+         return -1;
- 
--	header = vchiu_queue_pop(&service->queue);
-+   header = vchiu_queue_pop(&service->queue);
- 
--	memcpy(data, header->data, header->size < max_data_size_to_read ?
--		header->size : max_data_size_to_read);
-+   memcpy(data, header->data, header->size < max_data_size_to_read ? header->size : max_data_size_to_read);
- 
--	*actual_msg_size = header->size;
-+   *actual_msg_size = header->size;
- 
--	vchiq_release_message(service->handle, header);
-+   vchiq_release_message(service->handle, header);
- 
--	return 0;
-+   return 0;
- }
--EXPORT_SYMBOL(vchi_msg_dequeue);
- 
- /***********************************************************
-  * Name: vchi_msg_queuev
-  *
-  * Arguments:  VCHI_SERVICE_HANDLE_T handle,
-- *             VCHI_MSG_VECTOR_T *vector,
-- *             uint32_t count,
-+ *             const void *data,
-+ *             uint32_t data_size,
-  *             VCHI_FLAGS_T flags,
-  *             void *msg_handle
-  *
-@@ -349,46 +466,151 @@
-  *
-  ***********************************************************/
- 
--vchiq_static_assert(sizeof(VCHI_MSG_VECTOR_T) == sizeof(VCHIQ_ELEMENT_T));
--vchiq_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_base) ==
--	offsetof(VCHIQ_ELEMENT_T, data));
--vchiq_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_len) ==
--	offsetof(VCHIQ_ELEMENT_T, size));
--
--int32_t vchi_msg_queuev(VCHI_SERVICE_HANDLE_T handle,
--	VCHI_MSG_VECTOR_T *vector,
--	uint32_t count,
--	VCHI_FLAGS_T flags,
--	void *msg_handle)
-+vcos_static_assert(sizeof(VCHI_MSG_VECTOR_T) == sizeof(VCHIQ_ELEMENT_T));
-+vcos_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_base) == offsetof(VCHIQ_ELEMENT_T, data));
-+vcos_static_assert(offsetof(VCHI_MSG_VECTOR_T, vec_len) == offsetof(VCHIQ_ELEMENT_T, size));
-+
-+int32_t vchi_msg_queuev( VCHI_SERVICE_HANDLE_T handle,
-+                         VCHI_MSG_VECTOR_T * vector,
-+                         uint32_t count,
-+                         VCHI_FLAGS_T flags,
-+                         void *msg_handle )
- {
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
- 
--	(void)msg_handle;
-+   vcos_unused(msg_handle);
- 
--	WARN_ON(flags != VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
-+   vcos_assert(flags == VCHI_FLAGS_BLOCK_UNTIL_QUEUED);
- 
--	return vchiq_status_to_vchi(vchiq_queue_message(service->handle,
--		(const VCHIQ_ELEMENT_T *)vector, count));
-+   return vchiq_status_to_vchi(vchiq_queue_message(service->handle, (const VCHIQ_ELEMENT_T *)vector, count));
- }
--EXPORT_SYMBOL(vchi_msg_queuev);
-+
-+#ifdef USE_MEMMGR
-+
-+/***********************************************************
-+ * Name: vchi_msg_queuev_ex
-+ *
-+ * Arguments:  VCHI_SERVICE_HANDLE_T handle,
-+ *             VCHI_MSG_VECTOR_EX_T *vector
-+ *             uint32_t count
-+ *             VCHI_FLAGS_T flags,
-+ *             void *msg_handle
-+ *
-+ * Description: Thin wrapper to queue an array of messages onto a connection
-+ * Supports resolving MEM_HANDLE's at last possible moment to avoid deadlocks.
-+ *
-+ * Currently just a shim, so deadlocks are still possible!
-+ *
-+ * Returns: int32_t - success == 0
-+ *
-+ ***********************************************************/
-+int32_t vchi_msg_queuev_ex( const VCHI_SERVICE_HANDLE_T handle,
-+                            VCHI_MSG_VECTOR_EX_T * const vector,
-+                            const uint32_t count,
-+                            const VCHI_FLAGS_T flags,
-+                            void * const msg_handle )
-+{
-+   int32_t success = -1;
-+   // For now, we don't actually support sending anything other than
-+   // a pointer, so handles have to be patched up; this is likely
-+   // to cause deadlocks. This code is not designed to be either
-+   // pretty, efficient, or deadlock-free.
-+
-+   #define max_vecs 16
-+   VCHI_MSG_VECTOR_T copy[max_vecs];
-+   const uint8_t *orig[max_vecs];
-+
-+   int i;
-+   vcos_unused(msg_handle);
-+
-+   if (count > sizeof(copy)/sizeof(copy[0]))
-+   {
-+      vcos_assert(0);
-+      return -1;
-+   }
-+
-+   for (i=0; i<count; i++)
-+   {
-+      VCHI_MSG_VECTOR_EX_T *v = vector+i;
-+
-+      switch (vector[i].type)
-+      {
-+      case VCHI_VEC_POINTER:
-+         copy[i].vec_base = v->u.ptr.vec_base;
-+         copy[i].vec_len =  v->u.ptr.vec_len;
-+         break;
-+      case VCHI_VEC_HANDLE:
-+         vcos_assert(v->u.handle.offset+v->u.handle.vec_len <= mem_get_size(v->u.handle.handle));
-+         copy[i].vec_base = (uint8_t*)mem_lock(v->u.handle.handle) + v->u.handle.offset;
-+         orig[i] = copy[i].vec_base;
-+         copy[i].vec_len = v->u.handle.vec_len;
-+         break;
-+      case VCHI_VEC_LIST:
-+         vcos_assert(0); // FIXME: implement this
-+         break;
-+      default:
-+         vcos_assert(0);
-+      }
-+   }
-+   success = vchi_msg_queuev( handle,
-+                              copy,
-+                              count,
-+                              flags &~ VCHI_FLAGS_INTERNAL,
-+                              msg_handle );
-+   if (vcos_verify(success == 0))
-+   {
-+      // now we need to patch up the vectors if any have been only partially consumed, and
-+      // unlock memory handles.
-+   
-+      for (i=0; i<count; i++)
-+      {
-+         VCHI_MSG_VECTOR_EX_T *v = vector+i;
-+
-+         switch (vector[i].type)
-+         {
-+         case VCHI_VEC_POINTER:
-+            if (flags & VCHI_FLAGS_ALLOW_PARTIAL)
-+            {
-+               v->u.ptr.vec_base = copy[i].vec_base;
-+               v->u.ptr.vec_len  = copy[i].vec_len;
-+            }
-+            break;
-+         case VCHI_VEC_HANDLE:
-+            mem_unlock(v->u.handle.handle);
-+            if (flags & VCHI_FLAGS_ALLOW_PARTIAL)
-+            {
-+               const uint8_t *old = orig[i];
-+               uint32_t change = (const uint8_t*)copy[i].vec_base-old;
-+               v->u.handle.offset += change;
-+               v->u.handle.vec_len -= change;
-+            }
-+            break;
-+         default:
-+            vcos_assert(0);
-+         }
-+      }
-+   }
-+
-+   return vchiq_status_to_vchi(success);
-+}
-+
-+#endif
- 
- /***********************************************************
-  * Name: vchi_held_msg_release
-  *
-  * Arguments:  VCHI_HELD_MSG_T *message
-  *
-- * Description: Routine to release a held message (after it has been read with
-- *              vchi_msg_hold)
-+ * Description: Routine to release a held message (after it has been read with vchi_msg_hold)
-  *
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_held_msg_release(VCHI_HELD_MSG_T *message)
-+int32_t vchi_held_msg_release( VCHI_HELD_MSG_T *message )
- {
--	vchiq_release_message((VCHIQ_SERVICE_HANDLE_T)message->service,
--		(VCHIQ_HEADER_T *)message->message);
-+   vchiq_release_message((VCHIQ_SERVICE_HANDLE_T)message->service, (VCHIQ_HEADER_T *)message->message);
- 
--	return 0;
-+   return 0;
- }
- 
- /***********************************************************
-@@ -400,40 +622,37 @@
-  *             VCHI_FLAGS_T flags,
-  *             VCHI_HELD_MSG_T *message_handle
-  *
-- * Description: Routine to return a pointer to the current message (to allow
-- *              in place processing). The message is dequeued - don't forget
-- *              to release the message using vchi_held_msg_release when you're
-- *              finished.
-+ * Description: Routine to return a pointer to the current message (to allow in place processing)
-+ *              The message is dequeued - don't forget to release the message using
-+ *              vchi_held_msg_release when you're finished
-  *
-  * Returns: int32_t - success == 0
-  *
-  ***********************************************************/
--int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle,
--	void **data,
--	uint32_t *msg_size,
--	VCHI_FLAGS_T flags,
--	VCHI_HELD_MSG_T *message_handle)
-+int32_t vchi_msg_hold( VCHI_SERVICE_HANDLE_T handle,
-+                       void **data,
-+                       uint32_t *msg_size,
-+                       VCHI_FLAGS_T flags,
-+                       VCHI_HELD_MSG_T *message_handle )
- {
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	VCHIQ_HEADER_T *header;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   VCHIQ_HEADER_T *header;
- 
--	WARN_ON((flags != VCHI_FLAGS_NONE) &&
--		(flags != VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE));
-+   vcos_assert(flags == VCHI_FLAGS_NONE || flags == VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE);
- 
--	if (flags == VCHI_FLAGS_NONE)
--		if (vchiu_queue_is_empty(&service->queue))
--			return -1;
-+   if (flags == VCHI_FLAGS_NONE)
-+      if (vchiu_queue_is_empty(&service->queue))
-+         return -1;
- 
--	header = vchiu_queue_pop(&service->queue);
-+   header = vchiu_queue_pop(&service->queue);
- 
--	*data = header->data;
--	*msg_size = header->size;
-+   *data = header->data;
-+   *msg_size = header->size;
- 
--	message_handle->service =
--		(struct opaque_vchi_service_t *)service->handle;
--	message_handle->message = header;
-+   message_handle->service = (struct opaque_vchi_service_t *)service->handle;
-+   message_handle->message = header;
- 
--	return 0;
-+   return 0;
- }
- 
- /***********************************************************
-@@ -451,25 +670,24 @@
-  *
-  ***********************************************************/
- 
--int32_t vchi_initialise(VCHI_INSTANCE_T *instance_handle)
-+int32_t vchi_initialise( VCHI_INSTANCE_T *instance_handle )
- {
--	VCHIQ_INSTANCE_T instance;
--	VCHIQ_STATUS_T status;
-+   VCHIQ_INSTANCE_T instance;
-+   VCHIQ_STATUS_T status;
- 
--	status = vchiq_initialise(&instance);
-+   status = vchiq_initialise(&instance);
- 
--	*instance_handle = (VCHI_INSTANCE_T)instance;
-+   *instance_handle = (VCHI_INSTANCE_T)instance;
- 
--	return vchiq_status_to_vchi(status);
-+   return vchiq_status_to_vchi(status);
- }
--EXPORT_SYMBOL(vchi_initialise);
- 
- /***********************************************************
-  * Name: vchi_connect
-  *
-  * Arguments: VCHI_CONNECTION_T **connections
-  *            const uint32_t num_connections
-- *            VCHI_INSTANCE_T instance_handle)
-+ *            VCHI_INSTANCE_T instance_handle )
-  *
-  * Description: Starts the command service on each connection,
-  *              causing INIT messages to be pinged back and forth
-@@ -477,18 +695,17 @@
-  * Returns: 0 if successful, failure otherwise
-  *
-  ***********************************************************/
--int32_t vchi_connect(VCHI_CONNECTION_T **connections,
--	const uint32_t num_connections,
--	VCHI_INSTANCE_T instance_handle)
-+int32_t vchi_connect( VCHI_CONNECTION_T **connections,
-+                      const uint32_t num_connections,
-+                      VCHI_INSTANCE_T instance_handle )
- {
--	VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
-+   VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
- 
--	(void)connections;
--	(void)num_connections;
-+   vcos_unused(connections);
-+   vcos_unused(num_connections);
- 
--	return vchiq_connect(instance);
-+   return vchiq_connect(instance);
- }
--EXPORT_SYMBOL(vchi_connect);
- 
- 
- /***********************************************************
-@@ -502,12 +719,11 @@
-  * Returns: 0 if successful, failure otherwise
-  *
-  ***********************************************************/
--int32_t vchi_disconnect(VCHI_INSTANCE_T instance_handle)
-+int32_t vchi_disconnect( VCHI_INSTANCE_T instance_handle )
- {
--	VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
--	return vchiq_status_to_vchi(vchiq_shutdown(instance));
-+   VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
-+   return vchiq_status_to_vchi(vchiq_shutdown(instance));
- }
--EXPORT_SYMBOL(vchi_disconnect);
- 
- 
- /***********************************************************
-@@ -524,188 +740,168 @@
-  *
-  ***********************************************************/
- 
--static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,
--	VCHIQ_HEADER_T *header, VCHIQ_SERVICE_HANDLE_T handle, void *bulk_user)
-+static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header, VCHIQ_SERVICE_HANDLE_T handle, void *bulk_user)
- {
--	SHIM_SERVICE_T *service =
--		(SHIM_SERVICE_T *)VCHIQ_GET_SERVICE_USERDATA(handle);
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)VCHIQ_GET_SERVICE_USERDATA(handle);
- 
--	switch (reason) {
--	case VCHIQ_MESSAGE_AVAILABLE:
--		vchiu_queue_push(&service->queue, header);
--
--		if (service->callback)
--			service->callback(service->callback_param,
--				VCHI_CALLBACK_MSG_AVAILABLE, NULL);
--		break;
--	case VCHIQ_BULK_TRANSMIT_DONE:
--		if (service->callback)
--			service->callback(service->callback_param,
--				VCHI_CALLBACK_BULK_SENT, bulk_user);
--		break;
--	case VCHIQ_BULK_RECEIVE_DONE:
--		if (service->callback)
--			service->callback(service->callback_param,
--				VCHI_CALLBACK_BULK_RECEIVED, bulk_user);
--		break;
--	case VCHIQ_SERVICE_CLOSED:
--		if (service->callback)
--			service->callback(service->callback_param,
--				VCHI_CALLBACK_SERVICE_CLOSED, NULL);
--		break;
--	case VCHIQ_SERVICE_OPENED:
--		/* No equivalent VCHI reason */
--		break;
--	case VCHIQ_BULK_TRANSMIT_ABORTED:
--		if (service->callback)
--			service->callback(service->callback_param,
--				VCHI_CALLBACK_BULK_TRANSMIT_ABORTED, bulk_user);
--		break;
--	case VCHIQ_BULK_RECEIVE_ABORTED:
--		if (service->callback)
--			service->callback(service->callback_param,
--				VCHI_CALLBACK_BULK_RECEIVE_ABORTED, bulk_user);
--		break;
--	default:
--		WARN(1, "not supported\n");
--		break;
--	}
-+   switch (reason) {
-+   case VCHIQ_MESSAGE_AVAILABLE:
-+      vchiu_queue_push(&service->queue, header);
-+
-+      if (service->callback)
-+         service->callback(service->callback_param, VCHI_CALLBACK_MSG_AVAILABLE, NULL);
-+      break;
-+   case VCHIQ_BULK_TRANSMIT_DONE:
-+      if (service->callback)
-+         service->callback(service->callback_param, VCHI_CALLBACK_BULK_SENT, bulk_user);
-+      break;
-+   case VCHIQ_BULK_RECEIVE_DONE:
-+      if (service->callback)
-+         service->callback(service->callback_param, VCHI_CALLBACK_BULK_RECEIVED, bulk_user);
-+      break;
-+   case VCHIQ_SERVICE_CLOSED:
-+      if (service->callback)
-+         service->callback(service->callback_param, VCHI_CALLBACK_SERVICE_CLOSED, NULL);
-+      break;
-+   case VCHIQ_SERVICE_OPENED:
-+      /* No equivalent VCHI reason */
-+      break;
-+   case VCHIQ_BULK_TRANSMIT_ABORTED:
-+      if (service->callback)
-+         service->callback(service->callback_param, VCHI_CALLBACK_BULK_TRANSMIT_ABORTED, bulk_user);
-+      break;
-+   case VCHIQ_BULK_RECEIVE_ABORTED:
-+      if (service->callback)
-+         service->callback(service->callback_param, VCHI_CALLBACK_BULK_RECEIVE_ABORTED, bulk_user);
-+      break;
-+   default:
-+      vcos_assert(0);
-+      break;
-+   }
- 
--	return VCHIQ_SUCCESS;
-+   return VCHIQ_SUCCESS;
- }
- 
- static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance,
--	SERVICE_CREATION_T *setup)
-+                                     SERVICE_CREATION_T *setup)
- {
--	SHIM_SERVICE_T *service = kzalloc(sizeof(SHIM_SERVICE_T), GFP_KERNEL);
-+   SHIM_SERVICE_T *service = vcos_calloc(1, sizeof(SHIM_SERVICE_T), "vchiq_shim");
- 
--	(void)instance;
-+   vcos_unused(instance);
- 
--	if (service) {
--		if (vchiu_queue_init(&service->queue, 64)) {
--			service->callback = setup->callback;
--			service->callback_param = setup->callback_param;
--		} else {
--			kfree(service);
--			service = NULL;
--		}
--	}
-+   if (service)
-+   {
-+      if (vchiu_queue_init(&service->queue, 64))
-+      {
-+         service->callback = setup->callback;
-+         service->callback_param = setup->callback_param;
-+      }
-+      else
-+      {
-+         vcos_free(service);
-+         service = NULL;
-+      }
-+   }
- 
--	return service;
-+   return service;
- }
- 
- static void service_free(SHIM_SERVICE_T *service)
- {
--	if (service) {
--		vchiu_queue_delete(&service->queue);
--		kfree(service);
--	}
--}
--
--int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
--	SERVICE_CREATION_T *setup,
--	VCHI_SERVICE_HANDLE_T *handle)
--{
--	VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
--	SHIM_SERVICE_T *service = service_alloc(instance, setup);
--	if (service) {
--		VCHIQ_SERVICE_PARAMS_T params;
--		VCHIQ_STATUS_T status;
--
--		memset(&params, 0, sizeof(params));
--		params.fourcc = setup->service_id;
--		params.callback = shim_callback;
--		params.userdata = service;
--		params.version = setup->version.version;
--		params.version_min = setup->version.version_min;
--
--		status = vchiq_open_service(instance, &params,
--			&service->handle);
--		if (status != VCHIQ_SUCCESS) {
--			service_free(service);
--			service = NULL;
--		}
--	}
--
--	*handle = (VCHI_SERVICE_HANDLE_T)service;
--
--	return (service != NULL) ? 0 : -1;
-+   if (service)
-+   {
-+      vchiu_queue_delete(&service->queue);
-+      vcos_free((void*)service);
-+   }
-+}
-+
-+int32_t vchi_service_open( VCHI_INSTANCE_T instance_handle,
-+                           SERVICE_CREATION_T *setup,
-+                           VCHI_SERVICE_HANDLE_T *handle)
-+{
-+   VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
-+   SHIM_SERVICE_T *service = service_alloc(instance, setup);
-+   if (service)
-+   {
-+      VCHIQ_STATUS_T status = vchiq_open_service(instance, setup->service_id, shim_callback, service, &service->handle);
-+      if (status != VCHIQ_SUCCESS)
-+      {
-+         service_free(service);
-+         service = NULL;
-+      }
-+   }
-+
-+   *handle = (VCHI_SERVICE_HANDLE_T)service;
-+
-+   return (service != NULL) ? 0 : -1;
-+}
-+
-+int32_t vchi_service_create( VCHI_INSTANCE_T instance_handle,
-+                             SERVICE_CREATION_T *setup,
-+                             VCHI_SERVICE_HANDLE_T *handle )
-+{
-+   VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
-+   SHIM_SERVICE_T *service = service_alloc(instance, setup);
-+   if (service)
-+   {
-+      VCHIQ_STATUS_T status = vchiq_add_service(instance, setup->service_id, shim_callback, service, &service->handle);
-+      if (status != VCHIQ_SUCCESS)
-+      {
-+         service_free(service);
-+         service = NULL;
-+      }
-+   }
-+
-+   *handle = (VCHI_SERVICE_HANDLE_T)service;
-+
-+   return (service != NULL) ? 0 : -1;
-+}
-+
-+int32_t vchi_service_close( const VCHI_SERVICE_HANDLE_T handle )
-+{
-+   int32_t ret = -1;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   if(service)
-+   {
-+      VCHIQ_STATUS_T status = vchiq_close_service(service->handle);
-+      if (status == VCHIQ_SUCCESS)
-+      {
-+         service_free(service);
-+         service = NULL;
-+      }
-+
-+      ret = vchiq_status_to_vchi( status );
-+   }
-+   return ret;
-+}
-+
-+int32_t vchi_service_destroy( const VCHI_SERVICE_HANDLE_T handle )
-+{
-+   int32_t ret = -1;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   if(service)
-+   {
-+      VCHIQ_STATUS_T status = vchiq_remove_service(service->handle);
-+      if (status == VCHIQ_SUCCESS)
-+      {
-+         service_free(service);
-+         service = NULL;
-+      }
-+
-+      ret = vchiq_status_to_vchi( status );
-+   }
-+   return ret;
- }
--EXPORT_SYMBOL(vchi_service_open);
--
--int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle,
--	SERVICE_CREATION_T *setup,
--	VCHI_SERVICE_HANDLE_T *handle)
--{
--	VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
--	SHIM_SERVICE_T *service = service_alloc(instance, setup);
--	if (service) {
--		VCHIQ_SERVICE_PARAMS_T params;
--		VCHIQ_STATUS_T status;
--
--		memset(&params, 0, sizeof(params));
--		params.fourcc = setup->service_id;
--		params.callback = shim_callback;
--		params.userdata = service;
--		params.version = setup->version.version;
--		params.version_min = setup->version.version_min;
--		status = vchiq_add_service(instance, &params, &service->handle);
--
--		if (status != VCHIQ_SUCCESS) {
--			service_free(service);
--			service = NULL;
--		}
--	}
--
--	*handle = (VCHI_SERVICE_HANDLE_T)service;
--
--	return (service != NULL) ? 0 : -1;
--}
--EXPORT_SYMBOL(vchi_service_create);
--
--int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle)
--{
--	int32_t ret = -1;
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	if (service) {
--		VCHIQ_STATUS_T status = vchiq_close_service(service->handle);
--		if (status == VCHIQ_SUCCESS) {
--			service_free(service);
--			service = NULL;
--		}
--
--		ret = vchiq_status_to_vchi(status);
--	}
--	return ret;
--}
--EXPORT_SYMBOL(vchi_service_close);
--
--int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle)
--{
--	int32_t ret = -1;
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	if (service) {
--		VCHIQ_STATUS_T status = vchiq_remove_service(service->handle);
--		if (status == VCHIQ_SUCCESS) {
--			service_free(service);
--			service = NULL;
--		}
--
--		ret = vchiq_status_to_vchi(status);
--	}
--	return ret;
--}
--EXPORT_SYMBOL(vchi_service_destroy);
- 
- /* ----------------------------------------------------------------------
-  * read a uint32_t from buffer.
-  * network format is defined to be little endian
-  * -------------------------------------------------------------------- */
- uint32_t
--vchi_readbuf_uint32(const void *_ptr)
-+vchi_readbuf_uint32( const void *_ptr )
- {
--	const unsigned char *ptr = _ptr;
--	return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
-+   const unsigned char *ptr = _ptr;
-+   return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
- }
- 
- /* ----------------------------------------------------------------------
-@@ -713,13 +909,13 @@
-  * network format is defined to be little endian
-  * -------------------------------------------------------------------- */
- void
--vchi_writebuf_uint32(void *_ptr, uint32_t value)
-+vchi_writebuf_uint32( void *_ptr, uint32_t value )
- {
--	unsigned char *ptr = _ptr;
--	ptr[0] = (unsigned char)((value >> 0)  & 0xFF);
--	ptr[1] = (unsigned char)((value >> 8)  & 0xFF);
--	ptr[2] = (unsigned char)((value >> 16) & 0xFF);
--	ptr[3] = (unsigned char)((value >> 24) & 0xFF);
-+   unsigned char *ptr = _ptr;
-+   ptr[0] = (unsigned char)((value >> 0)  & 0xFF);
-+   ptr[1] = (unsigned char)((value >> 8)  & 0xFF);
-+   ptr[2] = (unsigned char)((value >> 16) & 0xFF);
-+   ptr[3] = (unsigned char)((value >> 24) & 0xFF);
- }
- 
- /* ----------------------------------------------------------------------
-@@ -727,10 +923,10 @@
-  * network format is defined to be little endian
-  * -------------------------------------------------------------------- */
- uint16_t
--vchi_readbuf_uint16(const void *_ptr)
-+vchi_readbuf_uint16( const void *_ptr )
- {
--	const unsigned char *ptr = _ptr;
--	return ptr[0] | (ptr[1] << 8);
-+   const unsigned char *ptr = _ptr;
-+   return ptr[0] | (ptr[1] << 8);
- }
- 
- /* ----------------------------------------------------------------------
-@@ -738,11 +934,11 @@
-  * network format is defined to be little endian
-  * -------------------------------------------------------------------- */
- void
--vchi_writebuf_uint16(void *_ptr, uint16_t value)
-+vchi_writebuf_uint16( void *_ptr, uint16_t value )
- {
--	unsigned char *ptr = _ptr;
--	ptr[0] = (value >> 0)  & 0xFF;
--	ptr[1] = (value >> 8)  & 0xFF;
-+   unsigned char *ptr = _ptr;
-+   ptr[0] = (value >> 0)  & 0xFF;
-+   ptr[1] = (value >> 8)  & 0xFF;
- }
- 
- /***********************************************************
-@@ -755,15 +951,16 @@
-  * Returns: void
-  *
-  ***********************************************************/
--int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle)
-+int32_t vchi_service_use( const VCHI_SERVICE_HANDLE_T handle )
- {
--	int32_t ret = -1;
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	if (service)
--		ret = vchiq_status_to_vchi(vchiq_use_service(service->handle));
--	return ret;
-+   int32_t ret = -1;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   if(service)
-+   {
-+      ret = vchiq_status_to_vchi(vchiq_use_service(service->handle));
-+   }
-+   return ret;
- }
--EXPORT_SYMBOL(vchi_service_use);
- 
- /***********************************************************
-  * Name: vchi_service_release
-@@ -775,13 +972,30 @@
-  * Returns: void
-  *
-  ***********************************************************/
--int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle)
-+int32_t vchi_service_release( const VCHI_SERVICE_HANDLE_T handle )
- {
--	int32_t ret = -1;
--	SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
--	if (service)
--		ret = vchiq_status_to_vchi(
--			vchiq_release_service(service->handle));
--	return ret;
-+   int32_t ret = -1;
-+   SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;
-+   if(service)
-+   {
-+      ret = vchiq_status_to_vchi(vchiq_release_service(service->handle));
-+   }
-+   return ret;
- }
-+
-+#if defined(__KERNEL__)
-+EXPORT_SYMBOL(vchi_initialise);
-+EXPORT_SYMBOL(vchi_connect);
-+EXPORT_SYMBOL(vchi_bulk_queue_transmit);
-+EXPORT_SYMBOL(vchi_msg_dequeue);
-+EXPORT_SYMBOL(vchi_msg_queue);
-+EXPORT_SYMBOL(vchi_msg_queuev);
-+EXPORT_SYMBOL(vchi_msg_peek);
-+EXPORT_SYMBOL(vchi_msg_remove);
-+EXPORT_SYMBOL(vchi_service_close);
-+EXPORT_SYMBOL(vchi_service_open);
-+EXPORT_SYMBOL(vchi_service_create);
-+EXPORT_SYMBOL(vchi_service_destroy);
-+EXPORT_SYMBOL(vchi_service_use);
- EXPORT_SYMBOL(vchi_service_release);
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c	2012-10-21 15:15:10.020260125 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c	2012-10-17 18:57:47.000000000 +0200
-@@ -18,88 +18,80 @@
- 
- #include "vchiq_util.h"
- 
--static inline int is_pow2(int i)
-+#if !defined(__KERNEL__)
-+#include <stdlib.h>
-+#endif
-+
-+static __inline int is_pow2(int i)
- {
--	return i && !(i & (i - 1));
-+  return i && !(i & (i - 1));
- }
- 
- int vchiu_queue_init(VCHIU_QUEUE_T *queue, int size)
- {
--	WARN_ON(!is_pow2(size));
-+   vcos_assert(is_pow2(size));
- 
--	queue->size = size;
--	queue->read = 0;
--	queue->write = 0;
--
--	sema_init(&queue->pop, 0);
--	sema_init(&queue->push, 0);
--
--	queue->storage = kzalloc(size * sizeof(VCHIQ_HEADER_T *), GFP_KERNEL);
--	if (queue->storage == NULL) {
--		vchiu_queue_delete(queue);
--		return 0;
--	}
--	return 1;
-+   queue->size = size;
-+   queue->read = 0;
-+   queue->write = 0;
-+
-+   vcos_event_create(&queue->pop, "vchiu");
-+   vcos_event_create(&queue->push, "vchiu");
-+
-+   queue->storage = vcos_malloc(size * sizeof(VCHIQ_HEADER_T *), VCOS_FUNCTION);
-+   if (queue->storage == NULL)
-+   {
-+      vchiu_queue_delete(queue);
-+      return 0;
-+   }
-+   return 1;
- }
- 
- void vchiu_queue_delete(VCHIU_QUEUE_T *queue)
- {
--	if (queue->storage != NULL)
--		kfree(queue->storage);
-+   vcos_event_delete(&queue->pop);
-+   vcos_event_delete(&queue->push);
-+   if (queue->storage != NULL)
-+      vcos_free(queue->storage);
- }
- 
- int vchiu_queue_is_empty(VCHIU_QUEUE_T *queue)
- {
--	return queue->read == queue->write;
--}
--
--int vchiu_queue_is_full(VCHIU_QUEUE_T *queue)
--{
--	return queue->write == queue->read + queue->size;
-+   return queue->read == queue->write;
- }
- 
- void vchiu_queue_push(VCHIU_QUEUE_T *queue, VCHIQ_HEADER_T *header)
- {
--	while (queue->write == queue->read + queue->size) {
--		if (down_interruptible(&queue->pop) != 0) {
--			flush_signals(current);
--		}
--	}
-+   while (queue->write == queue->read + queue->size)
-+      vcos_event_wait(&queue->pop);
- 
--	queue->storage[queue->write & (queue->size - 1)] = header;
-+   queue->storage[queue->write & (queue->size - 1)] = header;
- 
--	queue->write++;
-+   queue->write++;
- 
--	up(&queue->push);
-+   vcos_event_signal(&queue->push);
- }
- 
- VCHIQ_HEADER_T *vchiu_queue_peek(VCHIU_QUEUE_T *queue)
- {
--	while (queue->write == queue->read) {
--		if (down_interruptible(&queue->push) != 0) {
--			flush_signals(current);
--		}
--	}
-+   while (queue->write == queue->read)
-+      vcos_event_wait(&queue->push);
- 
--	up(&queue->push); // We haven't removed anything from the queue.
--	return queue->storage[queue->read & (queue->size - 1)];
-+   return queue->storage[queue->read & (queue->size - 1)];
- }
- 
- VCHIQ_HEADER_T *vchiu_queue_pop(VCHIU_QUEUE_T *queue)
- {
--	VCHIQ_HEADER_T *header;
-+   VCHIQ_HEADER_T *header;
- 
--	while (queue->write == queue->read) {
--		if (down_interruptible(&queue->push) != 0) {
--			flush_signals(current);
--		}
--	}
-+   while (queue->write == queue->read)
-+      vcos_event_wait(&queue->push);
- 
--	header = queue->storage[queue->read & (queue->size - 1)];
-+   header = queue->storage[queue->read & (queue->size - 1)];
- 
--	queue->read++;
-+   queue->read++;
- 
--	up(&queue->pop);
-+   vcos_event_signal(&queue->pop);
- 
--	return header;
-+   return header;
- }
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h	2012-10-21 15:15:10.020260125 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h	2012-10-17 18:57:47.000000000 +0200
-@@ -19,44 +19,24 @@
- #ifndef VCHIQ_UTIL_H
- #define VCHIQ_UTIL_H
- 
--#include <linux/types.h>
--#include <linux/semaphore.h>
--#include <linux/mutex.h>
--#include <linux/bitops.h>
--#include <linux/kthread.h>
--#include <linux/wait.h>
--#include <linux/vmalloc.h>
--#include <linux/jiffies.h>
--#include <linux/delay.h>
--#include <linux/string.h>
--#include <linux/types.h>
--#include <linux/interrupt.h>
--#include <linux/random.h>
--#include <linux/sched.h>
--#include <linux/ctype.h>
--#include <linux/uaccess.h>
--#include <linux/time.h>  /* for time_t */
--#include <linux/slab.h>
--#include <linux/vmalloc.h>
--
- #include "vchiq_if.h"
-+#include "interface/vcos/vcos.h"
- 
- typedef struct {
--	int size;
--	int read;
--	int write;
-+   int size;
-+   int read;
-+   int write;
- 
--	struct semaphore pop;
--	struct semaphore push;
-+   VCOS_EVENT_T pop;
-+   VCOS_EVENT_T push;
- 
--	VCHIQ_HEADER_T **storage;
-+   VCHIQ_HEADER_T **storage;
- } VCHIU_QUEUE_T;
- 
- extern int  vchiu_queue_init(VCHIU_QUEUE_T *queue, int size);
- extern void vchiu_queue_delete(VCHIU_QUEUE_T *queue);
- 
- extern int vchiu_queue_is_empty(VCHIU_QUEUE_T *queue);
--extern int vchiu_queue_is_full(VCHIU_QUEUE_T *queue);
- 
- extern void vchiu_queue_push(VCHIU_QUEUE_T *queue, VCHIQ_HEADER_T *header);
- 
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c	2012-10-21 15:15:10.021260145 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,27 +0,0 @@
--#include "vchiq_build_info.h"
--#include <linux/broadcom/vc_debug_sym.h>
--
--VC_DEBUG_DECLARE_STRING_VAR( vchiq_build_hostname, "dc4-arm-01" );
--VC_DEBUG_DECLARE_STRING_VAR( vchiq_build_version, "9245b4c35b99b3870e1f7dc598c5692b3c66a6f0 (tainted)" );
--VC_DEBUG_DECLARE_STRING_VAR( vchiq_build_time,    __TIME__ );
--VC_DEBUG_DECLARE_STRING_VAR( vchiq_build_date,    __DATE__ );
--
--const char *vchiq_get_build_hostname( void )
--{
--   return vchiq_build_hostname;
--}
--
--const char *vchiq_get_build_version( void )
--{
--   return vchiq_build_version;
--}
--
--const char *vchiq_get_build_date( void )
--{
--   return vchiq_build_date;
--}
--
--const char *vchiq_get_build_time( void )
--{
--   return vchiq_build_time;
--}
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,681 @@
-+/*****************************************************************************
-+* Copyright 2009 - 2011 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+*****************************************************************************/
-+
-+/***************************************************************************** 
-+* 
-+*    This file provides a generic command line interface which allows
-+*    vcos internals to be manipulated and/or displayed.
-+*  
-+*****************************************************************************/
-+
-+/* ---- Include Files ---------------------------------------------------- */
-+
-+#include "interface/vcos/vcos.h"
-+
-+#ifdef HAVE_VCOS_VERSION
-+#include "interface/vcos/vcos_build_info.h"
-+#endif
-+
-+        #ifdef _VIDEOCORE
-+#include vcfw/logging/logging.h
-+#endif
-+
-+/* ---- Public Variables ------------------------------------------------- */
-+
-+/* ---- Private Constants and Types -------------------------------------- */
-+
-+#define  VCOS_LOG_CATEGORY (&vcos_cmd_log_category)
-+VCOS_LOG_CAT_T vcos_cmd_log_category;
-+
-+/* ---- Private Variables ------------------------------------------------ */
-+
-+static struct VCOS_CMD_GLOBALS_T
-+{
-+    VCOS_MUTEX_T    lock;
-+    VCOS_ONCE_T     initialized;
-+
-+    unsigned        num_cmd_entries;
-+    unsigned        num_cmd_alloc;
-+    VCOS_CMD_T     *cmd_entry;
-+
-+    VCOS_LOG_CAT_T *log_category;
-+} cmd_globals;
-+
-+/* ---- Private Function Prototypes -------------------------------------- */
-+
-+static VCOS_STATUS_T help_cmd( VCOS_CMD_PARAM_T *param );
-+
-+/* ---- Functions  ------------------------------------------------------- */
-+
-+/***************************************************************************** 
-+*
-+*   Walks through the commands looking for a particular command
-+*
-+*****************************************************************************/
-+
-+static VCOS_CMD_T *find_cmd( VCOS_CMD_T *cmd_entry, const char *name )
-+{
-+    VCOS_CMD_T   *scan_entry = cmd_entry;
-+
-+    while ( scan_entry->name != NULL )
-+    {
-+        if ( vcos_strcmp( scan_entry->name, name ) == 0 )
-+        {
-+            return scan_entry;
-+        }
-+        scan_entry++;
-+    }
-+
-+    return NULL;
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Saves away 
-+*   each line individually.
-+*
-+*****************************************************************************/
-+
-+void vcos_cmd_always_log_output( VCOS_LOG_CAT_T *log_category )
-+{
-+    cmd_globals.log_category = log_category;
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Walks through a buffer containing newline separated lines, and logs
-+*   each line individually.
-+*
-+*****************************************************************************/
-+
-+static void cmd_log_results( VCOS_CMD_PARAM_T *param )
-+{
-+    char    *start;
-+    char    *end;
-+
-+    start = end = param->result_buf;
-+
-+    while ( *start != '\0' )
-+    {
-+        while (( *end != '\0' ) && ( *end != '\n' ))
-+            end++;
-+
-+        if ( *end == '\n' )
-+        {
-+            *end++ = '\0';
-+        }
-+
-+        if ( cmd_globals.log_category != NULL )
-+        {
-+            if ( vcos_is_log_enabled( cmd_globals.log_category, VCOS_LOG_INFO ))
-+            {
-+                vcos_log_impl( cmd_globals.log_category, VCOS_LOG_INFO, "%s", start );
-+            }
-+        }
-+        else
-+        {
-+            vcos_log_info( "%s", start );
-+        }
-+
-+        start = end;
-+    }
-+
-+    /* Since we logged the buffer, reset the pointer back to the beginning. */
-+
-+    param->result_ptr = param->result_buf;
-+    param->result_buf[0] = '\0';
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Since we may have limited output space, we create a generic routine
-+*   which tries to use the result space, but will switch over to using
-+*   logging if the output is too large.
-+*
-+*****************************************************************************/
-+
-+void vcos_cmd_vprintf( VCOS_CMD_PARAM_T *param, const char *fmt, va_list args )
-+{
-+    int     bytes_written;
-+    int     bytes_remaining;
-+
-+    bytes_remaining = (int)(param->result_size - ( param->result_ptr - param->result_buf ));
-+
-+    bytes_written = vcos_vsnprintf( param->result_ptr, bytes_remaining, fmt, args );
-+
-+    if ( cmd_globals.log_category != NULL )
-+    {
-+        /* We're going to log each line as we encounter it. If the buffer
-+         * doesn't end in a newline, then we'll wait for one first.
-+         */
-+
-+        if ( (( bytes_written + 1 ) >= bytes_remaining ) 
-+        ||   ( param->result_ptr[ bytes_written - 1 ] == '\n' ))
-+        {
-+            cmd_log_results( param );
-+        }
-+        else
-+        {
-+            param->result_ptr += bytes_written;
-+        }
-+    }
-+    else
-+    {
-+        if (( bytes_written + 1 ) >= bytes_remaining )
-+        {
-+            /* Output doesn't fit - switch over to logging */
-+
-+            param->use_log = 1;
-+
-+            *param->result_ptr = '\0';  /* Zap the partial line that didn't fit above. */
-+
-+            cmd_log_results( param );   /* resets result_ptr */
-+
-+            bytes_written = vcos_vsnprintf( param->result_ptr, bytes_remaining, fmt, args );
-+        }
-+        param->result_ptr += bytes_written;
-+    }
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Prints the output.
-+*
-+*****************************************************************************/
-+
-+void vcos_cmd_printf( VCOS_CMD_PARAM_T *param, const char *fmt, ... )
-+{
-+    va_list args;
-+
-+    va_start( args, fmt );
-+    vcos_cmd_vprintf( param, fmt, args );
-+    va_end( args );
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Prints the arguments which were on the command line prior to ours.
-+*
-+*****************************************************************************/
-+
-+static void print_argument_prefix( VCOS_CMD_PARAM_T *param )
-+{
-+    int arg_idx;
-+
-+    for ( arg_idx = 0; &param->argv_orig[arg_idx] != param->argv; arg_idx++ )
-+    {
-+        vcos_cmd_printf( param, "%s ", param->argv_orig[arg_idx] );
-+    }
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Prints an error message, prefixed by the command chain required to get
-+*   to where we're at.
-+*
-+*****************************************************************************/
-+
-+void vcos_cmd_error( VCOS_CMD_PARAM_T *param, const char *fmt, ... )
-+{
-+    va_list args;
-+
-+    print_argument_prefix( param );
-+
-+    va_start( args, fmt );
-+    vcos_cmd_vprintf( param, fmt, args );
-+    va_end( args );
-+    vcos_cmd_printf( param, "\n" );
-+}
-+
-+/****************************************************************************
-+*
-+*  usage - prints command usage for an array of commands.
-+*
-+***************************************************************************/
-+
-+static void usage( VCOS_CMD_PARAM_T *param, VCOS_CMD_T *cmd_entry )
-+{
-+    int         cmd_idx;
-+    int         nameWidth = 0;
-+    int         argsWidth = 0;
-+    VCOS_CMD_T *scan_entry;
-+
-+    vcos_cmd_printf( param, "Usage: " );
-+    print_argument_prefix( param );
-+    vcos_cmd_printf( param, "command [args ...]\n" );
-+    vcos_cmd_printf( param, "\n" );
-+    vcos_cmd_printf( param, "Where command is one of the following:\n" );
-+
-+    for ( cmd_idx = 0; cmd_entry[cmd_idx].name != NULL; cmd_idx++ )
-+    {
-+        int aw;
-+        int nw;
-+
-+        scan_entry = &cmd_entry[cmd_idx];
-+
-+        nw = vcos_strlen( scan_entry->name );
-+        aw = vcos_strlen( scan_entry->args );
-+
-+        if ( nw > nameWidth )
-+        {
-+            nameWidth = nw;
-+        }
-+        if ( aw > argsWidth )
-+        {
-+            argsWidth = aw;
-+        }
-+    }
-+
-+    for ( cmd_idx = 0; cmd_entry[cmd_idx].name != NULL; cmd_idx++ )
-+    {
-+        scan_entry = &cmd_entry[cmd_idx];
-+
-+        vcos_cmd_printf( param, "  %-*s %-*s - %s\n", 
-+                    nameWidth, scan_entry->name,
-+                    argsWidth, scan_entry->args,
-+                    scan_entry->descr );
-+    }
-+}
-+
-+/****************************************************************************
-+*
-+*  Prints the usage for the current command.
-+*
-+***************************************************************************/
-+
-+void vcos_cmd_usage( VCOS_CMD_PARAM_T *param )
-+{
-+    VCOS_CMD_T *cmd_entry;
-+
-+    cmd_entry = param->cmd_entry;
-+
-+    if ( cmd_entry->sub_cmd_entry != NULL )
-+    {
-+        /* This command is command with sub-commands */
-+
-+        usage( param, param->cmd_entry->sub_cmd_entry );
-+    }
-+    else
-+    {
-+        vcos_cmd_printf( param, "Usage: " );
-+        print_argument_prefix( param );
-+        vcos_cmd_printf( param, "%s - %s\n",
-+                         param->cmd_entry->args,
-+                         param->cmd_entry->descr );
-+    }
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Command to print out the help
-+* 
-+*   This help command is only called from the main menu.
-+* 
-+*****************************************************************************/
-+
-+static VCOS_STATUS_T help_cmd( VCOS_CMD_PARAM_T *param )
-+{
-+    VCOS_CMD_T  *found_entry;
-+
-+#if 0
-+    {
-+        int arg_idx;
-+
-+        vcos_log_trace( "%s: argc = %d", __func__, param->argc );
-+        for ( arg_idx = 0; arg_idx < param->argc; arg_idx++ )
-+        {
-+            vcos_log_trace( "%s:  argv[%d] = '%s'", __func__, arg_idx, param->argv[arg_idx] );
-+        }
-+    }
-+#endif
-+
-+    /* If there is an argument after the word help, then we want to print
-+     * help for that command.
-+     */
-+
-+    if ( param->argc == 1 )
-+    {
-+        if ( param->cmd_parent_entry == cmd_globals.cmd_entry )
-+        {
-+            /* Bare help - print the command usage for the root */
-+
-+            usage( param, cmd_globals.cmd_entry );
-+            return VCOS_SUCCESS;
-+        }
-+
-+        /* For all other cases help requires an argument */
-+            
-+        vcos_cmd_error( param, "%s requires an argument", param->argv[0] );
-+        return VCOS_EINVAL;
-+    }
-+
-+    /* We were given an argument. */
-+
-+    if (( found_entry = find_cmd( param->cmd_parent_entry, param->argv[1] )) != NULL )
-+    {
-+        /* Make it look like the command that was specified is the one that's
-+         * currently running
-+         */
-+
-+        param->cmd_entry = found_entry;
-+        param->argv[0] = param->argv[1];
-+        param->argv++;
-+        param->argc--;
-+
-+        vcos_cmd_usage( param );
-+        return VCOS_SUCCESS;
-+    }
-+
-+    vcos_cmd_error( param, "- unrecognized command: '%s'", param->argv[1] );
-+    return VCOS_ENOENT;
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Command to print out the version/build information.
-+*
-+*****************************************************************************/
-+
-+#ifdef HAVE_VCOS_VERSION
-+
-+static VCOS_STATUS_T version_cmd( VCOS_CMD_PARAM_T *param )
-+{
-+    static const char* copyright = "Copyright (c) 2011 Broadcom";
-+
-+    vcos_cmd_printf( param, "%s %s\n%s\nversion %s\n",
-+                     vcos_get_build_date(),
-+                     vcos_get_build_time(),
-+                     copyright,
-+                     vcos_get_build_version() );
-+
-+    return VCOS_SUCCESS;
-+}
-+
-+#endif
-+
-+/*****************************************************************************
-+*
-+*   Internal commands
-+*
-+*****************************************************************************/
-+
-+static VCOS_CMD_T cmd_help    = { "help",    "[command]", help_cmd,    NULL, "Prints command help information" };
-+
-+#ifdef HAVE_VCOS_VERSION
-+static VCOS_CMD_T cmd_version = { "version", "",          version_cmd, NULL, "Prints build/version information" };
-+#endif
-+
-+/***************************************************************************** 
-+*
-+*   Walks the command table and executes the commands
-+*
-+*****************************************************************************/
-+
-+static VCOS_STATUS_T execute_cmd( VCOS_CMD_PARAM_T *param, VCOS_CMD_T *cmd_entry )
-+{
-+    const char     *cmdStr;
-+    VCOS_CMD_T     *found_entry;
-+
-+#if 0
-+    {
-+        int arg_idx;
-+
-+        vcos_cmd_printf( param, "%s: argc = %d", __func__, param->argc );
-+        for ( arg_idx = 0; arg_idx < param->argc; arg_idx++ )
-+        {
-+            vcos_cmd_printf( param, " argv[%d] = '%s'", arg_idx, param->argv[arg_idx] );
-+        }
-+        vcos_cmd_printf( param, "\n" );
-+    }
-+#endif
-+
-+    if ( param->argc <= 1 )
-+    {
-+        /* No command specified */
-+
-+        vcos_cmd_error( param, "%s - no command specified", param->argv[0] );
-+        return VCOS_EINVAL;
-+    }
-+
-+    /* argv[0] is the command/program that caused us to get invoked, so we strip
-+     * it off.
-+     */
-+
-+    param->argc--;
-+    param->argv++;
-+    param->cmd_parent_entry = cmd_entry;
-+
-+    /* Not the help command, scan for the command and execute it. */
-+
-+    cmdStr = param->argv[0];
-+
-+    if (( found_entry = find_cmd( cmd_entry, cmdStr )) != NULL )
-+    {
-+        if ( found_entry->sub_cmd_entry != NULL )
-+        {
-+            return execute_cmd( param, found_entry->sub_cmd_entry );
-+        }
-+
-+        param->cmd_entry = found_entry;
-+        return found_entry->cmd_fn( param );
-+    }
-+
-+    /* Unrecognized command - check to see if it was the help command */
-+
-+    if ( vcos_strcmp( cmdStr, cmd_help.name ) == 0 )
-+    {
-+        return help_cmd( param );
-+    }
-+
-+    vcos_cmd_error( param, "- unrecognized command: '%s'", cmdStr );
-+    return VCOS_ENOENT;
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Initializes the command line parser.
-+*
-+*****************************************************************************/
-+
-+static void vcos_cmd_init( void )
-+{
-+    vcos_mutex_create( &cmd_globals.lock, "vcos_cmd" );
-+
-+    cmd_globals.num_cmd_entries = 0;
-+    cmd_globals.num_cmd_alloc = 0;
-+    cmd_globals.cmd_entry = NULL;
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Command line processor.
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_cmd_execute( int argc, char **argv, size_t result_size, char *result_buf )
-+{
-+    VCOS_STATUS_T       rc = VCOS_EINVAL;
-+    VCOS_CMD_PARAM_T    param;
-+
-+    vcos_once( &cmd_globals.initialized, vcos_cmd_init );
-+
-+    param.argc = argc;
-+    param.argv = param.argv_orig = argv;
-+
-+    param.use_log = 0;
-+    param.result_size = result_size;
-+    param.result_ptr = result_buf;
-+    param.result_buf = result_buf;
-+
-+	result_buf[0] = '\0';
-+
-+    vcos_mutex_lock( &cmd_globals.lock );
-+
-+    rc = execute_cmd( &param, cmd_globals.cmd_entry );
-+
-+    if ( param.use_log )
-+    {
-+        cmd_log_results( &param );
-+        vcos_snprintf( result_buf, result_size, "results logged" );
-+    }
-+    else
-+    if ( cmd_globals.log_category != NULL )
-+    {
-+        if ( result_buf[0] != '\0' )
-+        {
-+            /* There is a partial line still buffered. */
-+
-+            vcos_cmd_printf( &param, "\n" );
-+        }
-+    }
-+
-+    vcos_mutex_unlock( &cmd_globals.lock );
-+
-+    return rc;
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Registers a command entry with the command line processor
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_cmd_register( VCOS_CMD_T *cmd_entry )
-+{
-+    VCOS_STATUS_T   rc;
-+    VCOS_UNSIGNED   new_num_cmd_alloc;
-+    VCOS_CMD_T     *new_cmd_entry;
-+    VCOS_CMD_T     *old_cmd_entry;
-+    VCOS_CMD_T     *scan_entry;
-+
-+    vcos_once( &cmd_globals.initialized, vcos_cmd_init );
-+
-+    vcos_assert( cmd_entry != NULL );
-+    vcos_assert( cmd_entry->name != NULL );
-+
-+    vcos_log_trace( "%s: cmd '%s'", __FUNCTION__, cmd_entry->name );
-+
-+    vcos_assert( cmd_entry->args != NULL );
-+    vcos_assert(( cmd_entry->cmd_fn != NULL ) || ( cmd_entry->sub_cmd_entry != NULL ));
-+    vcos_assert( cmd_entry->descr != NULL );
-+
-+    /* We expect vcos_cmd_init to be called before vcos_logging_init, so we
-+     * need to defer registering our logging category until someplace
-+     * like right here.
-+     */
-+
-+    if ( vcos_cmd_log_category.name == NULL )
-+    {
-+        /*
-+         * If you're using the command interface, you pretty much always want
-+         * log messages from this file to show up. So we change the default
-+         * from ERROR to be the more reasonable INFO level.
-+         */
-+
-+        vcos_log_set_level(&vcos_cmd_log_category, VCOS_LOG_INFO);
-+        vcos_log_register("vcos_cmd", &vcos_cmd_log_category);
-+
-+        /* We register a help command so that it shows up in the usage. */
-+
-+        vcos_cmd_register( &cmd_help );
-+#ifdef HAVE_VCOS_VERSION
-+        vcos_cmd_register( &cmd_version );
-+#endif
-+    }
-+
-+    vcos_mutex_lock( &cmd_globals.lock );
-+
-+    if ( cmd_globals.num_cmd_entries >= cmd_globals.num_cmd_alloc )
-+    {
-+        if ( cmd_globals.num_cmd_alloc == 0 )
-+        {
-+            /* We haven't allocated a table yet */
-+        }
-+
-+        /* The number 8 is rather arbitrary. */
-+
-+        new_num_cmd_alloc = cmd_globals.num_cmd_alloc + 8;
-+
-+        /* The + 1 is to ensure that we always have a NULL entry at the end. */
-+
-+        new_cmd_entry = (VCOS_CMD_T *)vcos_calloc( new_num_cmd_alloc + 1, sizeof( *cmd_entry ), "vcos_cmd_entries" );
-+        if ( new_cmd_entry == NULL )
-+        {
-+            rc = VCOS_ENOMEM;
-+            goto out;
-+        }
-+        memcpy( new_cmd_entry, cmd_globals.cmd_entry, cmd_globals.num_cmd_entries * sizeof( *cmd_entry ));
-+        cmd_globals.num_cmd_alloc = new_num_cmd_alloc;
-+        old_cmd_entry = cmd_globals.cmd_entry;
-+        cmd_globals.cmd_entry = new_cmd_entry;
-+        vcos_free( old_cmd_entry );
-+    }
-+
-+    if ( cmd_globals.num_cmd_entries == 0 )
-+    {
-+        /* This is the first command being registered */
-+
-+        cmd_globals.cmd_entry[0] = *cmd_entry;
-+    }
-+    else
-+    {
-+        /* Keep the list in alphabetical order. We start at the end and work backwards
-+         * shuffling entries up one until we find an insertion point.
-+         */
-+
-+        for ( scan_entry = &cmd_globals.cmd_entry[cmd_globals.num_cmd_entries - 1];
-+              scan_entry >= cmd_globals.cmd_entry; scan_entry-- )
-+        {
-+            if ( vcos_strcmp( cmd_entry->name, scan_entry->name ) > 0 )
-+            {
-+                /* We found an insertion point. */
-+
-+                break;
-+            }
-+
-+            scan_entry[1] = scan_entry[0];
-+        }
-+        scan_entry[1] = *cmd_entry;
-+    }
-+    cmd_globals.num_cmd_entries++;
-+
-+    rc = VCOS_SUCCESS;
-+
-+out:
-+
-+    vcos_mutex_unlock( &cmd_globals.lock );
-+    return rc;
-+}
-+
-+/***************************************************************************** 
-+*
-+*   Registers multiple commands.
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_cmd_register_multiple( VCOS_CMD_T *cmd_entry )
-+{
-+    VCOS_STATUS_T   status;
-+
-+    while ( cmd_entry->name != NULL )
-+    {
-+        if (( status = vcos_cmd_register( cmd_entry )) != VCOS_SUCCESS )
-+        {
-+            return status;
-+        }
-+        cmd_entry++;
-+    }
-+    return VCOS_SUCCESS;
-+}
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,87 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - common postamble code
-+=============================================================================*/
-+
-+/** \file
-+  *
-+  * Postamble code included by the platform-specific header files
-+  */
-+
-+#define VCOS_THREAD_PRI_DEFAULT VCOS_THREAD_PRI_NORMAL
-+
-+#if !defined(VCOS_THREAD_PRI_INCREASE)
-+#error Which way to thread priorities go?
-+#endif
-+
-+#if VCOS_THREAD_PRI_INCREASE < 0
-+/* smaller numbers are higher priority */
-+#define VCOS_THREAD_PRI_LESS(x) ((x)<VCOS_THREAD_PRI_MAX?(x)+1:VCOS_THREAD_PRI_MAX)
-+#define VCOS_THREAD_PRI_MORE(x) ((x)>VCOS_THREAD_PRI_MIN?(x)-1:VCOS_THREAD_PRI_MIN)
-+#else
-+/* bigger numbers are lower priority */
-+#define VCOS_THREAD_PRI_MORE(x) ((x)<VCOS_THREAD_PRI_MAX?(x)+1:VCOS_THREAD_PRI_MAX)
-+#define VCOS_THREAD_PRI_LESS(x) ((x)>VCOS_THREAD_PRI_MIN?(x)-1:VCOS_THREAD_PRI_MIN)
-+#endif
-+
-+/* Convenience for Brits: */
-+#define VCOS_APPLICATION_INITIALISE VCOS_APPLICATION_INITIALIZE
-+
-+/*
-+ * Check for constant definitions
-+ */
-+#ifndef VCOS_TICKS_PER_SECOND
-+#error VCOS_TICKS_PER_SECOND not defined
-+#endif
-+
-+#if !defined(VCOS_THREAD_PRI_MIN) || !defined(VCOS_THREAD_PRI_MAX)
-+#error Priority range not defined
-+#endif
-+
-+#if !defined(VCOS_THREAD_PRI_HIGHEST) || !defined(VCOS_THREAD_PRI_LOWEST) || !defined(VCOS_THREAD_PRI_NORMAL)
-+#error Priority ordering not defined
-+#endif
-+
-+#if !defined(VCOS_CAN_SET_STACK_ADDR)
-+#error Can stack addresses be set on this platform? Please set this macro to either 0 or 1.
-+#endif
-+
-+#if (_VCOS_AFFINITY_CPU0|_VCOS_AFFINITY_CPU1) & (~_VCOS_AFFINITY_MASK) 
-+#error _VCOS_AFFINITY_CPUxxx values are not consistent with _VCOS_AFFINITY_MASK
-+#endif
-+
-+/** Append to the end of a singly-linked queue, O(1). Works with
-+  * any structure where list has members 'head' and 'tail' and
-+  * item has a 'next' pointer.
-+  */
-+#define VCOS_QUEUE_APPEND_TAIL(list, item) {\
-+   (item)->next = NULL;\
-+   if (!(list)->head) {\
-+      (list)->head = (list)->tail = (item); \
-+   } else {\
-+      (list)->tail->next = (item); \
-+      (list)->tail = (item); \
-+   } \
-+}
-+
-+#ifndef VCOS_HAVE_TIMER
-+VCOSPRE_ void VCOSPOST_ vcos_timer_init(void);
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,271 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - event flags implemented via a semaphore
-+=============================================================================*/
-+
-+#ifndef VCOS_GENERIC_BLOCKPOOL_H
-+#define VCOS_GENERIC_BLOCKPOOL_H
-+
-+/**
-+  * \file
-+  *
-+  * This provides a generic, thread safe implementation of a VCOS block pool
-+  * fixed size memory allocator.
-+  */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+
-+/** Bits 0 to (VCOS_BLOCKPOOL_SUBPOOL_BITS - 1) are used to store the
-+ * subpool id. */
-+#define VCOS_BLOCKPOOL_SUBPOOL_BITS 3
-+#define VCOS_BLOCKPOOL_MAX_SUBPOOLS (1 << VCOS_BLOCKPOOL_SUBPOOL_BITS)
-+
-+/* Make zero an invalid handle at the cost of decreasing the maximum
-+ * number of blocks (2^28) by 1. Alternatively, a spare bit could be
-+ * used to indicated valid blocks but there are likely to be better
-+ * uses for spare bits. e.g. allowing more subpools
-+ */
-+#define INDEX_OFFSET 1
-+
-+#define VCOS_BLOCKPOOL_HANDLE_GET_INDEX(h) \
-+   (((h) >> VCOS_BLOCKPOOL_SUBPOOL_BITS) - INDEX_OFFSET)
-+
-+#define VCOS_BLOCKPOOL_HANDLE_GET_SUBPOOL(h) \
-+   ((h) & ((1 << VCOS_BLOCKPOOL_SUBPOOL_BITS) - 1))
-+
-+#define VCOS_BLOCKPOOL_HANDLE_CREATE(i,s) \
-+   ((((i) + INDEX_OFFSET) << VCOS_BLOCKPOOL_SUBPOOL_BITS) | (s))
-+
-+#define VCOS_BLOCKPOOL_INVALID_HANDLE 0
-+
-+typedef struct VCOS_BLOCKPOOL_HEADER_TAG
-+{
-+   /* Blocks either refer to to the pool if they are allocated
-+    * or the free list if they are available.
-+    */
-+   union {
-+   struct VCOS_BLOCKPOOL_HEADER_TAG *next;
-+   struct VCOS_BLOCKPOOL_SUBPOOL_TAG* subpool;
-+   } owner;
-+} VCOS_BLOCKPOOL_HEADER_T;
-+
-+typedef struct VCOS_BLOCKPOOL_SUBPOOL_TAG
-+{
-+   /** VCOS_BLOCKPOOL_SUBPOOL_MAGIC */
-+   uint32_t magic;
-+   VCOS_BLOCKPOOL_HEADER_T* free_list;
-+   /* The start of the pool memory */
-+   void *mem;
-+   /* Address of the first block header */
-+   void *start;
-+   /** The number of blocks in this sub-pool */
-+   VCOS_UNSIGNED num_blocks;
-+   /** Current number of available blocks in this sub-pool */
-+   VCOS_UNSIGNED available_blocks;
-+   /** Pointers to the pool that owns this sub-pool */
-+   struct VCOS_BLOCKPOOL_TAG* owner;
-+   /** Define properties such as memory ownership */
-+   uint32_t flags;
-+} VCOS_BLOCKPOOL_SUBPOOL_T;
-+
-+typedef struct VCOS_BLOCKPOOL_TAG
-+{
-+   /** VCOS_BLOCKPOOL_MAGIC */
-+   uint32_t magic;
-+   /** Thread safety for Alloc, Free, Delete, Stats */
-+   VCOS_MUTEX_T mutex;
-+   /** The size of the block data */
-+   size_t block_data_size;
-+   /** Block size inc overheads */
-+   size_t block_size;
-+   /** Name for debugging */
-+   const char *name;
-+   /* The number of subpools that may be used */
-+   VCOS_UNSIGNED num_subpools;
-+   /** Number of blocks in each dynamically allocated subpool */
-+   VCOS_UNSIGNED num_extension_blocks;
-+   /** Array of subpools. Subpool zero is is not deleted until the pool is
-+    * destroed. If the index of the pool is < num_subpools and
-+    * subpool[index.mem] is null then the subpool entry is valid but
-+    * "not currently allocated" */
-+   VCOS_BLOCKPOOL_SUBPOOL_T subpools[VCOS_BLOCKPOOL_MAX_SUBPOOLS];
-+} VCOS_BLOCKPOOL_T;
-+
-+#define VCOS_BLOCKPOOL_ROUND_UP(x,s)   (((x) + ((s) - 1)) & ~((s) - 1))
-+/**
-+ * Calculates the size in bytes required for a block pool containing
-+ * num_blocks of size block_size plus any overheads.
-+ *
-+ * The block pool header (VCOS_BLOCKPOOL_T) is allocated separately
-+ *
-+ * Overheads:
-+ * block_size + header must be a multiple of sizeof(void*)
-+ * The start of the first block may need to be up to wordsize - 1 bytes
-+ * into the given buffer because statically allocated buffers within structures
-+ * are not guaranteed to be word aligned.
-+ */
-+#define VCOS_BLOCKPOOL_SIZE(num_blocks, block_size) \
-+   ((VCOS_BLOCKPOOL_ROUND_UP((block_size) + sizeof(VCOS_BLOCKPOOL_HEADER_T), \
-+                             sizeof(void*)) * (num_blocks)) + sizeof(void*))
-+
-+/**
-+ * Sanity check to verify whether a handle is potentially a blockpool handle
-+ * when the pool pointer is not available.
-+ *
-+ * If the pool pointer is availabe use vcos_blockpool_elem_to_handle instead.
-+ *
-+ * @param handle       the handle to verify
-+ * @param max_blocks   the expected maximum number of block in the pool
-+ *                     that the handle belongs to.
-+ */
-+#define VCOS_BLOCKPOOL_IS_VALID_HANDLE_FORMAT(handle, max_blocks) \
-+    ((handle) != VCOS_BLOCKPOOL_INVALID_HANDLE \
-+     && VCOS_BLOCKPOOL_HANDLE_GET_INDEX((handle)) < (max_blocks))
-+
-+VCOSPRE_
-+   VCOS_STATUS_T VCOSPOST_ vcos_generic_blockpool_init(VCOS_BLOCKPOOL_T *pool,
-+      VCOS_UNSIGNED num_blocks, VCOS_UNSIGNED block_size,
-+      void *start, VCOS_UNSIGNED pool_size, const char *name);
-+
-+VCOSPRE_
-+   VCOS_STATUS_T VCOSPOST_ vcos_generic_blockpool_create_on_heap(
-+         VCOS_BLOCKPOOL_T *pool, VCOS_UNSIGNED num_blocks,
-+         VCOS_UNSIGNED block_size, const char *name);
-+
-+VCOSPRE_
-+   VCOS_STATUS_T VCOSPOST_ vcos_generic_blockpool_extend(VCOS_BLOCKPOOL_T *pool,
-+         VCOS_UNSIGNED num_extensions, VCOS_UNSIGNED num_blocks);
-+
-+VCOSPRE_ void VCOSPOST_ *vcos_generic_blockpool_alloc(VCOS_BLOCKPOOL_T *pool);
-+
-+VCOSPRE_ void VCOSPOST_ *vcos_generic_blockpool_calloc(VCOS_BLOCKPOOL_T *pool);
-+
-+VCOSPRE_ void VCOSPOST_ vcos_generic_blockpool_free(void *block);
-+
-+VCOSPRE_
-+   VCOS_UNSIGNED VCOSPOST_ vcos_generic_blockpool_available_count(
-+         VCOS_BLOCKPOOL_T *pool);
-+
-+VCOSPRE_
-+   VCOS_UNSIGNED VCOSPOST_ vcos_generic_blockpool_used_count(
-+         VCOS_BLOCKPOOL_T *pool);
-+
-+VCOSPRE_ void VCOSPOST_ vcos_generic_blockpool_delete(VCOS_BLOCKPOOL_T *pool);
-+
-+VCOSPRE_ uint32_t VCOSPOST_ vcos_generic_blockpool_elem_to_handle(void *block);
-+
-+VCOSPRE_ void VCOSPOST_
-+   *vcos_generic_blockpool_elem_from_handle(
-+         VCOS_BLOCKPOOL_T *pool, uint32_t handle);
-+
-+VCOSPRE_ uint32_t VCOSPOST_
-+   vcos_generic_blockpool_is_valid_elem(
-+         VCOS_BLOCKPOOL_T *pool, const void *block);
-+#if defined(VCOS_INLINE_BODIES)
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_blockpool_init(VCOS_BLOCKPOOL_T *pool,
-+      VCOS_UNSIGNED num_blocks, VCOS_UNSIGNED block_size,
-+      void *start, VCOS_UNSIGNED pool_size, const char *name)
-+{
-+   return vcos_generic_blockpool_init(pool, num_blocks, block_size,
-+         start, pool_size, name);
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_blockpool_create_on_heap(VCOS_BLOCKPOOL_T *pool,
-+      VCOS_UNSIGNED num_blocks, VCOS_UNSIGNED block_size, const char *name)
-+{
-+   return vcos_generic_blockpool_create_on_heap(
-+         pool, num_blocks, block_size, name);
-+}
-+
-+VCOS_INLINE_IMPL
-+   VCOS_STATUS_T VCOSPOST_ vcos_blockpool_extend(VCOS_BLOCKPOOL_T *pool,
-+         VCOS_UNSIGNED num_extensions, VCOS_UNSIGNED num_blocks)
-+{
-+    return vcos_generic_blockpool_extend(pool, num_extensions, num_blocks);
-+}
-+
-+VCOS_INLINE_IMPL
-+void *vcos_blockpool_alloc(VCOS_BLOCKPOOL_T *pool)
-+{
-+   return vcos_generic_blockpool_alloc(pool);
-+}
-+
-+VCOS_INLINE_IMPL
-+void *vcos_blockpool_calloc(VCOS_BLOCKPOOL_T *pool)
-+{
-+   return vcos_generic_blockpool_calloc(pool);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_blockpool_free(void *block)
-+{
-+   vcos_generic_blockpool_free(block);
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_UNSIGNED vcos_blockpool_available_count(VCOS_BLOCKPOOL_T *pool)
-+{
-+   return vcos_generic_blockpool_available_count(pool);
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_UNSIGNED vcos_blockpool_used_count(VCOS_BLOCKPOOL_T *pool)
-+{
-+   return vcos_generic_blockpool_used_count(pool);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_blockpool_delete(VCOS_BLOCKPOOL_T *pool)
-+{
-+   vcos_generic_blockpool_delete(pool);
-+}
-+
-+VCOS_INLINE_IMPL
-+uint32_t vcos_blockpool_elem_to_handle(void *block)
-+{
-+   return vcos_generic_blockpool_elem_to_handle(block);
-+}
-+
-+VCOS_INLINE_IMPL
-+void *vcos_blockpool_elem_from_handle(VCOS_BLOCKPOOL_T *pool, uint32_t handle)
-+{
-+   return vcos_generic_blockpool_elem_from_handle(pool, handle);
-+}
-+
-+VCOS_INLINE_IMPL
-+uint32_t vcos_blockpool_is_valid_elem(VCOS_BLOCKPOOL_T *pool, const void *block)
-+{
-+   return vcos_generic_blockpool_is_valid_elem(pool, block);
-+}
-+#endif /* VCOS_INLINE_BODIES */
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif /* VCOS_GENERIC_BLOCKPOOL_H */
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,311 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - event flags implemented via mutexes
-+=============================================================================*/
-+
-+#include "interface/vcos/vcos.h"
-+#include "interface/vcos/generic/vcos_generic_event_flags.h"
-+
-+#include <stddef.h>
-+
-+/** A structure created by a thread that waits on the event flags
-+  * for a particular combination of flags to arrive.
-+  */
-+typedef struct VCOS_EVENT_WAITER_T
-+{
-+   VCOS_UNSIGNED requested_events;  /**< The events wanted */
-+   VCOS_UNSIGNED actual_events;     /**< Actual events found */
-+   VCOS_UNSIGNED op;                /**< The event operation to be used */
-+   VCOS_STATUS_T return_status;     /**< The return status the waiter should pass back */
-+   VCOS_EVENT_FLAGS_T *flags;       /**< Pointer to the original 'flags' structure */
-+   VCOS_THREAD_T *thread;           /**< Thread waiting */
-+   struct VCOS_EVENT_WAITER_T *next;
-+} VCOS_EVENT_WAITER_T;
-+
-+#ifndef NDEBUG
-+static int waiter_list_valid(VCOS_EVENT_FLAGS_T *flags);
-+#endif
-+static void event_flags_timer_expired(void *cxt);
-+
-+VCOS_STATUS_T vcos_generic_event_flags_create(VCOS_EVENT_FLAGS_T *flags, const char *name)
-+{
-+   VCOS_STATUS_T rc;
-+   if ((rc=vcos_mutex_create(&flags->lock, name)) != VCOS_SUCCESS)
-+   {
-+      return rc;
-+   }
-+
-+   flags->events = 0;
-+   flags->waiters.head = flags->waiters.tail = 0;
-+   return rc;
-+}
-+
-+void vcos_generic_event_flags_set(VCOS_EVENT_FLAGS_T *flags,
-+                                  VCOS_UNSIGNED bitmask,
-+                                  VCOS_OPTION op)
-+{
-+   vcos_assert(flags);
-+   vcos_mutex_lock(&flags->lock);
-+   if (op == VCOS_OR)
-+   {
-+      flags->events |= bitmask;
-+   }
-+   else if (op == VCOS_AND)
-+   {
-+      flags->events &= bitmask;
-+   }
-+   else
-+   {
-+      vcos_assert(0);
-+   }
-+
-+   /* Now wake up any threads that have now become signalled. */
-+   if (flags->waiters.head != NULL)
-+   {
-+      VCOS_UNSIGNED consumed_events = 0;
-+      VCOS_EVENT_WAITER_T **pcurrent_waiter = &flags->waiters.head;
-+      VCOS_EVENT_WAITER_T *prev_waiter = NULL;
-+
-+      /* Walk the chain of tasks suspend on this event flag group to determine
-+       * if any of their requests can be satisfied.
-+       */
-+      while ((*pcurrent_waiter) != NULL)
-+      {
-+         VCOS_EVENT_WAITER_T *curr_waiter = *pcurrent_waiter;
-+
-+         /* Determine if this request has been satisfied */
-+
-+         /* First, find the event flags in common. */
-+         VCOS_UNSIGNED waiter_satisfied = flags->events & curr_waiter->requested_events;
-+
-+         /* Second, determine if all the event flags must match */
-+         if (curr_waiter->op & VCOS_AND)
-+         {
-+            /* All requested events must be present */
-+            waiter_satisfied = (waiter_satisfied == curr_waiter->requested_events);
-+         }
-+
-+         /* Wake this one up? */
-+         if (waiter_satisfied)
-+         {
-+
-+            if (curr_waiter->op & VCOS_CONSUME)
-+            {
-+               consumed_events |= curr_waiter->requested_events;
-+            }
-+
-+            /* remove this block from the list, taking care at the end */
-+            *pcurrent_waiter = curr_waiter->next;
-+            if (curr_waiter->next == NULL)
-+               flags->waiters.tail = prev_waiter;
-+
-+            vcos_assert(waiter_list_valid(flags));
-+
-+            curr_waiter->return_status = VCOS_SUCCESS;
-+            curr_waiter->actual_events = flags->events;
-+
-+            _vcos_thread_sem_post(curr_waiter->thread);
-+         }
-+         else
-+         {
-+            /* move to next element in the list */
-+            prev_waiter = *pcurrent_waiter;
-+            pcurrent_waiter = &(curr_waiter->next);
-+         }
-+      }
-+
-+      flags->events &= ~consumed_events;
-+
-+   }
-+
-+   vcos_mutex_unlock(&flags->lock);
-+}
-+
-+void vcos_generic_event_flags_delete(VCOS_EVENT_FLAGS_T *flags)
-+{
-+   vcos_mutex_delete(&flags->lock);
-+}
-+
-+extern VCOS_STATUS_T vcos_generic_event_flags_get(VCOS_EVENT_FLAGS_T *flags,
-+                                                  VCOS_UNSIGNED bitmask,
-+                                                  VCOS_OPTION op,
-+                                                  VCOS_UNSIGNED suspend,
-+                                                  VCOS_UNSIGNED *retrieved_bits)
-+{
-+   VCOS_EVENT_WAITER_T waitreq;
-+   VCOS_STATUS_T rc = VCOS_EAGAIN;
-+   int satisfied = 0;
-+
-+   vcos_assert(flags);
-+
-+   /* default retrieved bits to 0 */
-+   *retrieved_bits = 0;
-+
-+   vcos_mutex_lock(&flags->lock);
-+   switch (op & VCOS_EVENT_FLAG_OP_MASK)
-+   {
-+   case VCOS_AND:
-+      if ((flags->events & bitmask) == bitmask)
-+      {
-+         *retrieved_bits = flags->events;
-+         rc = VCOS_SUCCESS;
-+         satisfied = 1;
-+         if (op & VCOS_CONSUME)
-+            flags->events &= ~bitmask;
-+      }
-+      break;
-+
-+   case VCOS_OR:
-+      if (flags->events & bitmask)
-+      {
-+         *retrieved_bits = flags->events;
-+         rc = VCOS_SUCCESS;
-+         satisfied = 1;
-+         if (op & VCOS_CONSUME)
-+            flags->events &= ~bitmask;
-+      }
-+      break;
-+
-+   default:
-+      vcos_assert(0);
-+      rc = VCOS_EINVAL;
-+      break;
-+   }
-+
-+   if (!satisfied && suspend)
-+   {
-+      /* Have to go to sleep.
-+       *
-+       * Append to tail so we get FIFO ordering.
-+       */
-+      waitreq.requested_events = bitmask;
-+      waitreq.op = op;
-+      waitreq.return_status = VCOS_EAGAIN;
-+      waitreq.flags = flags;
-+      waitreq.actual_events = 0;
-+      waitreq.thread = vcos_thread_current();
-+      waitreq.next = 0;
-+      vcos_assert(waitreq.thread != (VCOS_THREAD_T*)-1);
-+      VCOS_QUEUE_APPEND_TAIL(&flags->waiters, &waitreq);
-+
-+      if (suspend != (VCOS_UNSIGNED)-1)
-+         _vcos_task_timer_set(event_flags_timer_expired, &waitreq, suspend);
-+
-+      vcos_mutex_unlock(&flags->lock);
-+      /* go to sleep and wait to be signalled or timeout */
-+
-+      _vcos_thread_sem_wait();
-+
-+      *retrieved_bits = waitreq.actual_events;
-+      rc = waitreq.return_status;
-+
-+      /* cancel the timer - do not do this while holding the mutex as it
-+       * might be waiting for the timeout function to complete, which will
-+       * try to take the mutex.
-+       */
-+      if (suspend != (VCOS_UNSIGNED)-1)
-+         _vcos_task_timer_cancel();
-+   }
-+   else
-+   {
-+      vcos_mutex_unlock(&flags->lock);
-+   }
-+
-+   return rc;
-+}
-+
-+
-+/** Called when a get call times out. Remove this thread's
-+  * entry from the waiting queue, then resume the thread.
-+  */
-+static void event_flags_timer_expired(void *cxt)
-+{
-+   VCOS_EVENT_WAITER_T *waitreq = (VCOS_EVENT_WAITER_T *)cxt;
-+   VCOS_EVENT_FLAGS_T *flags = waitreq->flags;
-+   VCOS_EVENT_WAITER_T **plist;
-+   VCOS_EVENT_WAITER_T *prev = NULL;
-+   VCOS_THREAD_T *thread = 0;
-+
-+   vcos_assert(flags);
-+
-+   vcos_mutex_lock(&flags->lock);
-+
-+   /* walk the list of waiting threads on this event group, and remove
-+    * the one that has expired.
-+    *
-+    * FIXME: could use doubly-linked list if lots of threads are found
-+    * to be waiting on a single event flag instance.
-+    */
-+   plist = &flags->waiters.head;
-+   while (*plist != NULL)
-+   {
-+      if (*plist == waitreq)
-+      {
-+         int at_end;
-+         /* found it */
-+         thread = (*plist)->thread;
-+         at_end = ((*plist)->next == NULL);
-+
-+         /* link past */
-+         *plist = (*plist)->next;
-+         if (at_end)
-+            flags->waiters.tail = prev;
-+
-+         break;
-+      }
-+      prev = *plist;
-+      plist = &(*plist)->next;
-+   }
-+   vcos_assert(waiter_list_valid(flags));
-+
-+   vcos_mutex_unlock(&flags->lock);
-+
-+   if (thread)
-+   {
-+      _vcos_thread_sem_post(thread);
-+   }
-+}
-+
-+#ifndef NDEBUG
-+
-+static int waiter_list_valid(VCOS_EVENT_FLAGS_T *flags)
-+{
-+   int valid;
-+   /* Either both head and tail are NULL, or neither are NULL */
-+   if (flags->waiters.head == NULL)
-+   {
-+      valid = (flags->waiters.tail == NULL);
-+   }
-+   else
-+   {
-+      valid = (flags->waiters.tail != NULL);
-+   }
-+
-+   /* If head and tail point at the same non-NULL element, then there
-+    * is only one element in the list.
-+    */
-+   if (flags->waiters.head && (flags->waiters.head == flags->waiters.tail))
-+   {
-+      valid = (flags->waiters.head->next == NULL);
-+   }
-+   return valid;
-+}
-+
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,118 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - event flags implemented via a semaphore
-+=============================================================================*/
-+
-+#ifndef VCOS_GENERIC_EVENT_FLAGS_H
-+#define VCOS_GENERIC_EVENT_FLAGS_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+
-+/**
-+  * \file
-+  *
-+  * This provides event flags (as per Nucleus Event Groups) based on a
-+  * mutex, a semaphore (per waiting thread) and a timer (per waiting
-+  * thread).
-+  * 
-+  * The data structure is a 32 bit unsigned int (the current set of
-+  * flags) and a linked list of clients waiting to be 'satisfied'.
-+  *
-+  * The mutex merely locks access to the data structure. If a client
-+  * calls vcos_event_flags_get() and the requested bits are not already
-+  * present, it then sleeps on its per-thread semaphore after adding
-+  * this semaphore to the queue waiting. It also sets up a timer.
-+  *
-+  * The per-thread semaphore and timer are actually stored in the
-+  * thread context (joinable thread). In future it may become necessary
-+  * to support non-VCOS threads by using thread local storage to
-+  * create these objects and associate them with the thread.
-+  */
-+
-+struct VCOS_EVENT_WAITER_T;
-+
-+typedef struct VCOS_EVENT_FLAGS_T
-+{
-+   VCOS_UNSIGNED events;      /**< Events currently set */
-+   VCOS_MUTEX_T lock;         /**< Serialize access */
-+   struct
-+   {
-+      struct VCOS_EVENT_WAITER_T *head;   /**< List of threads waiting */
-+      struct VCOS_EVENT_WAITER_T *tail;   /**< List of threads waiting */
-+   } waiters;
-+} VCOS_EVENT_FLAGS_T;
-+
-+#define VCOS_OR      1
-+#define VCOS_AND     2
-+#define VCOS_CONSUME 4
-+#define VCOS_OR_CONSUME (VCOS_OR | VCOS_CONSUME)
-+#define VCOS_AND_CONSUME (VCOS_AND | VCOS_CONSUME)
-+#define VCOS_EVENT_FLAG_OP_MASK (VCOS_OR|VCOS_AND)
-+
-+VCOSPRE_  VCOS_STATUS_T VCOSPOST_ vcos_generic_event_flags_create(VCOS_EVENT_FLAGS_T *flags, const char *name);
-+VCOSPRE_  void VCOSPOST_ vcos_generic_event_flags_set(VCOS_EVENT_FLAGS_T *flags,
-+                                                      VCOS_UNSIGNED events,
-+                                                      VCOS_OPTION op);
-+VCOSPRE_  void VCOSPOST_ vcos_generic_event_flags_delete(VCOS_EVENT_FLAGS_T *);
-+VCOSPRE_  VCOS_STATUS_T VCOSPOST_ vcos_generic_event_flags_get(VCOS_EVENT_FLAGS_T *flags,
-+                                                               VCOS_UNSIGNED requested_events,
-+                                                               VCOS_OPTION op,
-+                                                               VCOS_UNSIGNED suspend,
-+                                                               VCOS_UNSIGNED *retrieved_events);
-+
-+#ifdef VCOS_INLINE_BODIES
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_event_flags_create(VCOS_EVENT_FLAGS_T *flags, const char *name) {
-+   return vcos_generic_event_flags_create(flags, name);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_event_flags_set(VCOS_EVENT_FLAGS_T *flags,
-+                          VCOS_UNSIGNED events,
-+                          VCOS_OPTION op) {
-+   vcos_generic_event_flags_set(flags, events, op);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_event_flags_delete(VCOS_EVENT_FLAGS_T *f) {
-+   vcos_generic_event_flags_delete(f);
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_event_flags_get(VCOS_EVENT_FLAGS_T *flags,
-+                                   VCOS_UNSIGNED requested_events,
-+                                   VCOS_OPTION op,
-+                                   VCOS_UNSIGNED suspend,
-+                                   VCOS_UNSIGNED *retrieved_events) {
-+   return vcos_generic_event_flags_get(flags, requested_events, op, suspend, retrieved_events);
-+}
-+
-+#endif /* VCOS_INLINE_BODIES */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,92 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - named semaphores
-+=============================================================================*/
-+
-+#ifndef VCOS_GENERIC_NAMED_SEM_H
-+#define VCOS_GENERIC_NAMED_SEM_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+
-+/**
-+ * \file
-+ *
-+ * Generic support for named semaphores, using regular ones. This is only
-+ * suitable for emulating them on an embedded MMUless system, since there is
-+ * no support for opening semaphores across process boundaries.
-+ *
-+ */
-+
-+#define VCOS_NAMED_SEMAPHORE_NAMELEN   64
-+
-+/* In theory we could use the name facility provided within Nucleus. However, this
-+ * is hard to do as semaphores are constantly being created and destroyed; we
-+ * would need to stop everything while allocating the memory for the semaphore
-+ * list and then walking it. So keep our own list.
-+ */
-+typedef struct VCOS_NAMED_SEMAPHORE_T
-+{
-+   struct VCOS_NAMED_SEMAPHORE_IMPL_T *actual; /**< There are 'n' named semaphores per 1 actual semaphore  */
-+   VCOS_SEMAPHORE_T *sem;                      /**< Pointer to actual underlying semaphore */
-+} VCOS_NAMED_SEMAPHORE_T;
-+
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_
-+vcos_generic_named_semaphore_create(VCOS_NAMED_SEMAPHORE_T *sem, const char *name, VCOS_UNSIGNED count);
-+
-+VCOSPRE_ void VCOSPOST_ vcos_named_semaphore_delete(VCOS_NAMED_SEMAPHORE_T *sem);
-+
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ _vcos_named_semaphore_init(void);
-+VCOSPRE_ void VCOSPOST_ _vcos_named_semaphore_deinit(void);
-+
-+#if defined(VCOS_INLINE_BODIES)
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_named_semaphore_create(VCOS_NAMED_SEMAPHORE_T *sem, const char *name, VCOS_UNSIGNED count) {
-+   return vcos_generic_named_semaphore_create(sem, name, count);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_named_semaphore_wait(VCOS_NAMED_SEMAPHORE_T *sem) {
-+   vcos_semaphore_wait(sem->sem);
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_named_semaphore_trywait(VCOS_NAMED_SEMAPHORE_T *sem) {
-+   return vcos_semaphore_trywait(sem->sem);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_named_semaphore_post(VCOS_NAMED_SEMAPHORE_T *sem) {
-+   vcos_semaphore_post(sem->sem);
-+}
-+
-+
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,86 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - reentrant mutexes created from regular ones.
-+=============================================================================*/
-+
-+#ifndef VCOS_GENERIC_QUICKSLOW_MUTEX_H
-+#define VCOS_GENERIC_QUICKSLOW_MUTEX_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+
-+/**
-+ * \file
-+ *
-+ * Quickslow Mutexes implemented as regular ones (i.e. quick and slow modes are the same).
-+ *
-+ */
-+
-+typedef VCOS_MUTEX_T VCOS_QUICKSLOW_MUTEX_T;
-+
-+#if defined(VCOS_INLINE_BODIES)
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_quickslow_mutex_create(VCOS_QUICKSLOW_MUTEX_T *m, const char *name)
-+{
-+   return vcos_mutex_create(m, name);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_quickslow_mutex_delete(VCOS_QUICKSLOW_MUTEX_T *m)
-+{
-+   vcos_mutex_delete(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_quickslow_mutex_lock(VCOS_QUICKSLOW_MUTEX_T *m)
-+{
-+   while (vcos_mutex_lock(m) == VCOS_EAGAIN);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_quickslow_mutex_unlock(VCOS_QUICKSLOW_MUTEX_T *m)
-+{
-+   vcos_mutex_unlock(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_quickslow_mutex_lock_quick(VCOS_QUICKSLOW_MUTEX_T *m)
-+{
-+   while (vcos_mutex_lock(m) == VCOS_EAGAIN);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_quickslow_mutex_unlock_quick(VCOS_QUICKSLOW_MUTEX_T *m)
-+{
-+   vcos_mutex_unlock(m);
-+}
-+
-+#endif
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,86 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - reentrant mutexes created from regular ones.
-+=============================================================================*/
-+
-+#ifndef VCOS_GENERIC_REENTRANT_MUTEX_H
-+#define VCOS_GENERIC_REENTRANT_MUTEX_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+
-+/**
-+ * \file
-+ *
-+ * Reentrant Mutexes from regular ones.
-+ *
-+ */
-+
-+typedef struct VCOS_REENTRANT_MUTEX_T
-+{
-+   VCOS_MUTEX_T mutex;
-+   VCOS_THREAD_T *owner;
-+   unsigned count;
-+} VCOS_REENTRANT_MUTEX_T;
-+
-+/* Extern definitions of functions that do the actual work */
-+
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_generic_reentrant_mutex_create(VCOS_REENTRANT_MUTEX_T *m, const char *name);
-+
-+VCOSPRE_ void VCOSPOST_ vcos_generic_reentrant_mutex_delete(VCOS_REENTRANT_MUTEX_T *m);
-+
-+VCOSPRE_ void VCOSPOST_ vcos_generic_reentrant_mutex_lock(VCOS_REENTRANT_MUTEX_T *m);
-+
-+VCOSPRE_ void VCOSPOST_ vcos_generic_reentrant_mutex_unlock(VCOS_REENTRANT_MUTEX_T *m);
-+
-+/* Inline forwarding functions */
-+
-+#if defined(VCOS_INLINE_BODIES)
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_reentrant_mutex_create(VCOS_REENTRANT_MUTEX_T *m, const char *name) {
-+   return vcos_generic_reentrant_mutex_create(m,name);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_reentrant_mutex_delete(VCOS_REENTRANT_MUTEX_T *m) {
-+   vcos_generic_reentrant_mutex_delete(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_reentrant_mutex_lock(VCOS_REENTRANT_MUTEX_T *m) {
-+   vcos_generic_reentrant_mutex_lock(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_reentrant_mutex_unlock(VCOS_REENTRANT_MUTEX_T *m) {
-+   vcos_generic_reentrant_mutex_unlock(m);
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,155 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - generic thread local storage
-+=============================================================================*/
-+
-+#ifndef VCOS_GENERIC_TLS_H
-+#define VCOS_GENERIC_TLS_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+
-+/**
-+  * \file
-+  *
-+  * Do an emulation of Thread Local Storage. The platform needs to
-+  * provide a way to set and get a per-thread pointer which is
-+  * where the TLS data itself is stored.
-+  *
-+  *
-+  * Each thread that wants to join in this scheme needs to call
-+  * vcos_tls_thread_register().
-+  *
-+  * The platform needs to support the macros/functions
-+  * _vcos_tls_thread_ptr_set() and _vcos_tls_thread_ptr_get().
-+  */
-+
-+#ifndef VCOS_WANT_TLS_EMULATION
-+#error Should not be included unless TLS emulation is defined
-+#endif
-+
-+/** Number of slots to reserve per thread. This results in an overhead
-+  * of this many words per thread.
-+  */
-+#define VCOS_TLS_MAX_SLOTS 4
-+
-+/** TLS key. Allocating one of these reserves the client one of the 
-+  * available slots.
-+  */
-+typedef VCOS_UNSIGNED VCOS_TLS_KEY_T;
-+
-+/** TLS per-thread structure. Each thread gets one of these
-+  * if TLS emulation (rather than native TLS support) is
-+  * being used.
-+  */
-+typedef struct VCOS_TLS_THREAD_T
-+{
-+   void *slots[VCOS_TLS_MAX_SLOTS];
-+} VCOS_TLS_THREAD_T;
-+
-+/*
-+ * Internal APIs 
-+ */
-+
-+/** Register this thread's TLS storage area. */
-+VCOSPRE_ void VCOSPOST_ vcos_tls_thread_register(VCOS_TLS_THREAD_T *);
-+
-+/** Create a new TLS key */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_generic_tls_create(VCOS_TLS_KEY_T *key);
-+
-+/** Delete a TLS key */
-+VCOSPRE_ void VCOSPOST_ vcos_generic_tls_delete(VCOS_TLS_KEY_T tls);
-+
-+/** Initialise the TLS library */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_tls_init(void);
-+
-+/** Deinitialise the TLS library */
-+VCOSPRE_ void VCOSPOST_ vcos_tls_deinit(void);
-+
-+#if defined(VCOS_INLINE_BODIES)
-+
-+#undef VCOS_ASSERT_LOGGING_DISABLE
-+#define VCOS_ASSERT_LOGGING_DISABLE 1
-+
-+/*
-+ * Implementations of public API functions
-+ */
-+
-+/** Set the given value. Since everything is per-thread, there is no need
-+  * for any locking.
-+  */
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_tls_set(VCOS_TLS_KEY_T tls, void *v) {
-+   VCOS_TLS_THREAD_T *tlsdata = _vcos_tls_thread_ptr_get();
-+   vcos_assert(tlsdata); /* Fires if this thread has not been registered */
-+   if (tls<VCOS_TLS_MAX_SLOTS)
-+   {
-+      tlsdata->slots[tls] = v;
-+      return VCOS_SUCCESS;
-+   }
-+   else
-+   {
-+      vcos_assert(0);
-+      return VCOS_EINVAL;
-+   }
-+}
-+
-+/** Get the given value. No locking required.
-+  */
-+VCOS_INLINE_IMPL
-+void *vcos_tls_get(VCOS_TLS_KEY_T tls) {
-+   VCOS_TLS_THREAD_T *tlsdata = _vcos_tls_thread_ptr_get();
-+   vcos_assert(tlsdata); /* Fires if this thread has not been registered */
-+   if (tls<VCOS_TLS_MAX_SLOTS)
-+   {
-+      return tlsdata->slots[tls];
-+   }
-+   else
-+   {
-+      vcos_assert(0);
-+      return NULL;
-+   }
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_tls_create(VCOS_TLS_KEY_T *key) {
-+   return vcos_generic_tls_create(key);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_tls_delete(VCOS_TLS_KEY_T tls) {
-+   vcos_generic_tls_delete(tls);
-+}
-+
-+#undef VCOS_ASSERT_LOGGING_DISABLE
-+#define VCOS_ASSERT_LOGGING_DISABLE 0
-+
-+#endif /* VCOS_INLINE_BODIES */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,214 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - implementation: joinable thread from plain
-+=============================================================================*/
-+
-+/** \file
-+  *
-+  * Header file for platforms creating the joinable thread from a lowlevel
-+  * thread.
-+  *
-+  * In addition to the actual thread, the following are also created:
-+  *
-+  * - a semaphore to wait on when joining the thread
-+  * - a semaphore to support counted suspend/resume (used by event group)
-+  * - a per-thread timer (used by event group, but could be removed)
-+  */
-+
-+#ifndef VCOS_JOINABLE_THREAD_FROM_PLAIN_H
-+#define VCOS_JOINABLE_THREAD_FROM_PLAIN_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_semaphore.h"
-+#include "interface/vcos/vcos_lowlevel_thread.h"
-+#include "interface/vcos/vcos_timer.h"
-+
-+#ifdef VCOS_WANT_TLS_EMULATION
-+#include "interface/vcos/generic/vcos_generic_tls.h"
-+#endif
-+
-+#define VCOS_THREAD_MAGIC 0x56436a74
-+
-+#define VCOS_THREAD_VALID(t) (t->magic == VCOS_THREAD_MAGIC)
-+#define VCOS_HAVE_THREAD_AT_EXIT        1
-+
-+/** Thread attribute structure. Clients should not manipulate this directly, but
-+  * should instead use the provided functions.
-+  */
-+typedef struct VCOS_THREAD_ATTR_T
-+{
-+   void *ta_stackaddr;
-+   VCOS_UNSIGNED ta_stacksz;
-+   VCOS_UNSIGNED ta_priority;
-+   VCOS_UNSIGNED ta_affinity;
-+   VCOS_UNSIGNED ta_timeslice;
-+   VCOS_UNSIGNED legacy;
-+   VCOS_UNSIGNED ta_autostart;
-+} VCOS_THREAD_ATTR_T;
-+
-+/** Each thread gets a timer, which is for internal VCOS use.
-+  */
-+typedef struct _VCOS_THREAD_TIMER_T
-+{
-+   VCOS_TIMER_T timer;
-+   void (*pfn)(void *);
-+   void *cxt;
-+} _VCOS_THREAD_TIMER_T;
-+
-+typedef void (*VCOS_THREAD_EXIT_HANDLER_T)(void *);
-+/** Called at thread exit.
-+  */
-+typedef struct VCOS_THREAD_EXIT_T
-+{
-+   VCOS_THREAD_EXIT_HANDLER_T pfn;
-+   void *cxt;
-+} VCOS_THREAD_EXIT_T;
-+#define VCOS_MAX_EXIT_HANDLERS  8
-+
-+/* The name field isn't used for anything, so we can just copy the
-+ * the pointer. Nucleus makes its own copy.
-+ */
-+typedef const char *          VCOS_LLTHREAD_T_NAME;
-+#define _VCOS_LLTHREAD_NAME(dst,src) (dst)=(src)
-+
-+/*
-+ * Simulated TLS support
-+ */
-+
-+
-+/** Thread structure.
-+  *
-+  * \warning Do not access the members of this structure directly!
-+  */
-+typedef struct VCOS_THREAD_T
-+{
-+   VCOS_LLTHREAD_T  thread;      /**< The underlying thread */
-+   char name[16];                /**< The name */
-+   unsigned int     magic;       /**< For debug */
-+   void            *exit_data;   /**< Exit data passed out in vcos_joinable_thread_exit() */
-+   void            *stack;       /**< Stack, if not supplied by caller */
-+   VCOS_SEMAPHORE_T wait;        /**< Semaphore to wait on at join */
-+   VCOS_SEMAPHORE_T suspend;     /**< Semaphore to wait on for counted suspend */
-+   int16_t          joined;      /**< Joined yet? For debug. */
-+   VCOS_UNSIGNED    legacy;      /**< Use (argc,argv) for entry point arguments */
-+   void *(*entry)(void*);        /**< Entry point */
-+   void             *arg;        /**< Argument passed to entry point */
-+   void *(*term)(void*);         /**< Termination function, used by reaper */
-+   void             *term_arg;   /**< Argument passed to termination function */
-+   _VCOS_THREAD_TIMER_T _timer;  /**< Internal timer, mainly for event groups */
-+#ifdef VCOS_WANT_TLS_EMULATION
-+   VCOS_TLS_THREAD_T   _tls;     /**< TLS data when native TLS not available, or NULL */
-+#endif
-+   /** Array of functions to call at thread exit */
-+   VCOS_THREAD_EXIT_T at_exit[VCOS_MAX_EXIT_HANDLERS];
-+
-+   struct VCOS_THREAD_T *next;   /**< For linked lists of threads */
-+} VCOS_THREAD_T;
-+
-+#if defined(VCOS_INLINE_BODIES)
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_attr_setstack(VCOS_THREAD_ATTR_T *attrs, void *addr, VCOS_UNSIGNED stacksz) {
-+   attrs->ta_stackaddr = addr;
-+   attrs->ta_stacksz = stacksz;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_attr_setstacksize(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED stacksz) {
-+   attrs->ta_stacksz = stacksz;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_attr_setpriority(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED pri) {
-+   attrs->ta_priority = pri;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_attr_setaffinity(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED affinity) {
-+   attrs->ta_affinity = affinity;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_attr_settimeslice(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED ts) {
-+   attrs->ta_timeslice = ts;
-+}
-+
-+VCOS_INLINE_IMPL
-+void _vcos_thread_attr_setlegacyapi(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED legacy) {
-+   attrs->legacy = legacy;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_attr_setautostart(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED autostart) {
-+   attrs->ta_autostart = autostart;
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_THREAD_T *vcos_thread_current(void) {
-+   VCOS_THREAD_T *ret =  (VCOS_THREAD_T*)vcos_llthread_current();
-+   /*If we're called from a non-vcos thread, this assert will fail.
-+    *XXX FIXME why is this commented out?
-+    *vcos_assert(ret->magic == VCOS_THREAD_MAGIC);
-+    */
-+   return ret;
-+}
-+
-+VCOS_INLINE_IMPL
-+int vcos_thread_running(VCOS_THREAD_T *thread) {
-+   return vcos_llthread_running(&thread->thread);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_resume(VCOS_THREAD_T *thread) {
-+   vcos_llthread_resume(&thread->thread);
-+}
-+
-+#endif /* VCOS_INLINE_BODIES */
-+
-+/**
-+  * \brief Create a VCOS_THREAD_T for the current thread. This is so we can have
-+  * VCOS_THREAD_Ts even for threads not originally created by VCOS (eg the
-+  * thread that calls vcos_init)
-+  */
-+extern VCOS_STATUS_T _vcos_thread_create_attach(VCOS_THREAD_T *thread,
-+                                                const char *name);
-+
-+/**
-+  * \brief Deletes the VCOS_THREAD_T, but does not wait for the underlying
-+  * thread to exit. This will cleanup everything created by
-+  * _vcos_thread_create_attach
-+  */
-+extern void _vcos_thread_delete(VCOS_THREAD_T *thread);
-+
-+/** Register a function to be called when the current thread exits.
-+  */
-+extern VCOS_STATUS_T vcos_thread_at_exit(void (*pfn)(void*), void *cxt);
-+
-+/** Deregister a previously registered at-exit function.
-+  */
-+extern void vcos_thread_deregister_at_exit(void (*pfn)(void*), void *cxt);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif /* VCOS_JOINABLE_THREAD_FROM_PLAIN_H */
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - Construct a latch from a semaphore
-+=============================================================================*/
-+
-+/** FIXME: rename to vcos_mutex_from_sem.c
-+  */
-+
-+typedef struct VCOS_MUTEX_T {
-+   VCOS_SEMAPHORE_T sem;
-+   struct VCOS_THREAD_T *owner;
-+} VCOS_MUTEX_T;
-+
-+extern VCOS_STATUS_T vcos_generic_mutex_create(VCOS_MUTEX_T *latch, const char *name);
-+extern void vcos_generic_mutex_delete(VCOS_MUTEX_T *latch);
-+extern VCOS_STATUS_T vcos_generic_mutex_lock(VCOS_MUTEX_T *latch);
-+extern void vcos_generic_mutex_unlock(VCOS_MUTEX_T *latch);
-+
-+#if defined(VCOS_INLINE_BODIES)
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_mutex_create(VCOS_MUTEX_T *latch, const char *name) {
-+   return vcos_generic_mutex_create(latch,name);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_mutex_delete(VCOS_MUTEX_T *latch) {
-+   vcos_generic_mutex_delete(latch);
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_mutex_lock(VCOS_MUTEX_T *latch) {
-+   return vcos_generic_mutex_lock(latch);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_mutex_unlock(VCOS_MUTEX_T *latch) {
-+   vcos_generic_mutex_unlock(latch);
-+}
-+
-+#endif /* VCOS_INLINE_BODIES */
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,560 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+Categorized logging for VCOS - a generic implementation.
-+=============================================================================*/
-+
-+#include "interface/vcos/vcos.h"
-+#include "interface/vcos/vcos_ctype.h"
-+#include "interface/vcos/vcos_string.h"
-+
-+static VCOS_MUTEX_T lock;
-+static int warned_loglevel;             /* only warn about invalid log level once */
-+static VCOS_VLOG_IMPL_FUNC_T vcos_vlog_impl_func = vcos_vlog_default_impl;
-+
-+#define  VCOS_LOG_CATEGORY (&dflt_log_category)
-+static VCOS_LOG_CAT_T dflt_log_category;
-+VCOS_LOG_CAT_T *vcos_logging_categories = NULL;
-+static int inited;
-+
-+#if VCOS_HAVE_CMD
-+
-+/*
-+ * For kernel or videocore purposes, we generally want the log command. For 
-+ * user-space apps, they might want to provide their own log command, so we 
-+ * don't include the built in on. 
-+ *  
-+ * So pthreads/vcos_platform.h defines VCOS_WANT_LOG_CMD to be 0. It is 
-+ * undefined elsewhere. 
-+ */
-+
-+#  if !defined( VCOS_WANT_LOG_CMD )
-+#     define  VCOS_WANT_LOG_CMD 1
-+#  endif
-+#else
-+#  define VCOS_WANT_LOG_CMD   0
-+#endif
-+
-+#if VCOS_WANT_LOG_CMD
-+
-+/*****************************************************************************
-+*
-+*   Does a vcos_assert(0), which is useful to test logging.
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_log_assert_cmd( VCOS_CMD_PARAM_T *param )
-+{
-+   (void)param;
-+
-+#if defined( NDEBUG ) && !defined( VCOS_RELEASE_ASSERTS )
-+   vcos_log_error( "vcos_asserts have been compiled out" );
-+   vcos_cmd_printf( param, "vcos_asserts have been compiled out - did a vcos_log_error instead\n" );
-+#else
-+   vcos_assert(0);
-+   vcos_cmd_printf( param, "Executed vcos_assert(0)\n" );
-+#endif
-+
-+   return VCOS_SUCCESS;
-+}
-+
-+/*****************************************************************************
-+*
-+*   Sets a vcos logging level
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_log_set_cmd( VCOS_CMD_PARAM_T *param )
-+{
-+   VCOS_LOG_CAT_T   *cat;
-+   char             *name;
-+   char             *levelStr;
-+   VCOS_LOG_LEVEL_T  level;
-+   VCOS_STATUS_T     status;
-+
-+   if ( param->argc != 3 )
-+   {
-+      vcos_cmd_usage( param );
-+      return VCOS_EINVAL;
-+   }
-+
-+   name = param->argv[1];
-+   levelStr = param->argv[2];
-+
-+   if ( vcos_string_to_log_level( levelStr, &level ) != VCOS_SUCCESS )
-+   {
-+      vcos_cmd_printf( param, "Unrecognized logging level: '%s'\n", levelStr );
-+      return VCOS_EINVAL;
-+   }
-+
-+   vcos_mutex_lock(&lock);
-+
-+   status = VCOS_SUCCESS;
-+   for ( cat = vcos_logging_categories; cat != NULL; cat = cat->next )
-+   {
-+      if ( vcos_strcmp( name, cat->name ) == 0 )
-+      {
-+         cat->level = level;
-+         vcos_cmd_printf( param, "Category %s level set to %s\n", name, levelStr );
-+         break;
-+      }
-+   }
-+   if ( cat == NULL )
-+   {
-+      vcos_cmd_printf( param, "Unrecognized category: '%s'\n", name );
-+      status = VCOS_ENOENT;
-+   }
-+
-+   vcos_mutex_unlock(&lock);
-+
-+   return status;
-+}
-+
-+/*****************************************************************************
-+*
-+*   Prints out the current settings for a given category (or all cvategories)
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_log_status_cmd( VCOS_CMD_PARAM_T *param )
-+{
-+   VCOS_LOG_CAT_T   *cat;
-+   VCOS_STATUS_T     status;
-+
-+   vcos_mutex_lock(&lock);
-+
-+   if ( param->argc == 1)
-+   {
-+      int   nw;
-+      int   nameWidth = 0;
-+
-+      /* Print information about all of the categories. */
-+
-+      for ( cat = vcos_logging_categories; cat != NULL; cat = cat->next )
-+      {
-+         nw = (int)strlen( cat->name );
-+
-+         if ( nw > nameWidth )
-+         {
-+            nameWidth = nw;
-+         }
-+      }
-+
-+      for ( cat = vcos_logging_categories; cat != NULL; cat = cat->next )
-+      {
-+         vcos_cmd_printf( param, "%-*s - %s\n", nameWidth, cat->name, vcos_log_level_to_string( cat->level ));
-+      }
-+   }
-+   else
-+   {
-+      /* Print information about a particular category */
-+
-+      for ( cat = vcos_logging_categories; cat != NULL; cat = cat->next )
-+      {
-+         if ( vcos_strcmp( cat->name, param->argv[1] ) == 0 )
-+         {
-+            vcos_cmd_printf( param, "%s - %s\n", cat->name, vcos_log_level_to_string( cat->level ));
-+            break;
-+         }
-+      }
-+      if ( cat == NULL )
-+      {
-+         vcos_cmd_printf( param, "Unrecognized logging category: '%s'\n", param->argv[1] );
-+         status = VCOS_ENOENT;
-+         goto out;
-+      }
-+   }
-+
-+   status = VCOS_SUCCESS;
-+out:
-+   vcos_mutex_unlock(&lock);
-+
-+   return status;
-+}
-+
-+/*****************************************************************************
-+*
-+*   Prints out the current settings for a given category (or all cvategories)
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_log_test_cmd( VCOS_CMD_PARAM_T *param )
-+{
-+   if ( param->argc == 1 )
-+   {
-+      static   int seq_num = 100;
-+
-+      /* No additional arguments - generate a message with an incrementing number */
-+
-+      vcos_log_error( "Test message %d", seq_num );
-+
-+      seq_num++;
-+      vcos_cmd_printf( param, "Logged 'Test message %d'\n", seq_num );
-+   }
-+   else
-+   {
-+      int   arg_idx;
-+
-+      /* Arguments supplied - log these */
-+
-+      for ( arg_idx = 0; arg_idx < param->argc; arg_idx++ )
-+      {
-+         vcos_log_error( "argv[%d] = '%s'", arg_idx, param->argv[arg_idx] );
-+      }
-+      vcos_cmd_printf( param, "Logged %d line(s) of test data\n", param->argc );
-+   }
-+   return VCOS_SUCCESS;
-+}
-+
-+/*****************************************************************************
-+*
-+*   Internal commands
-+*
-+*****************************************************************************/
-+
-+static VCOS_CMD_T log_cmd_entry[] =
-+{
-+    { "assert",   "",                  vcos_log_assert_cmd, NULL,    "Does a vcos_assert(0) to test logging" },
-+    { "set",      "category level",    vcos_log_set_cmd,    NULL,    "Sets the vcos logging level for a category" },
-+    { "status",   "[category]",        vcos_log_status_cmd, NULL,    "Prints the vcos log status for a (or all) categories" },
-+    { "test",     "[arbitrary text]",  vcos_log_test_cmd,   NULL,    "Does a vcos_log to test logging" },
-+
-+    { NULL,       NULL,                NULL,                NULL,    NULL }
-+};
-+
-+static VCOS_CMD_T cmd_log =
-+    { "log",        "command [args]",  NULL,    log_cmd_entry, "Commands related to vcos logging" };
-+
-+#endif
-+
-+void vcos_logging_init(void)
-+{
-+   if (inited)
-+   {
-+      /* FIXME: should print a warning or something here */
-+      return;
-+   }
-+   vcos_mutex_create(&lock, "vcos_log");
-+
-+   vcos_log_platform_init();
-+
-+   vcos_log_register("default", &dflt_log_category);
-+
-+#if VCOS_WANT_LOG_CMD
-+   vcos_cmd_register( &cmd_log );
-+#endif
-+
-+   vcos_assert(!inited);
-+   inited = 1;
-+}
-+
-+/** Read an alphanumeric token, returning True if we succeeded.
-+  */
-+
-+static int read_tok(char *tok, size_t toklen, const char **pstr, char sep)
-+{
-+   const char *str = *pstr;
-+   size_t n = 0;
-+   char ch;
-+
-+   /* skip past any whitespace */
-+   while (str[0] && isspace((int)(str[0])))
-+      str++;
-+
-+   while ((ch = *str) != '\0' &&
-+          ch != sep &&
-+          (isalnum((int)ch) || (ch == '_')) &&
-+          n != toklen-1)
-+   {
-+      tok[n++] = ch;
-+      str++;
-+   }
-+
-+   /* did it work out? */
-+   if (ch == '\0' || ch == sep)
-+   {
-+      if (ch) str++; /* move to next token if not at end */
-+      /* yes */
-+      tok[n] = '\0';
-+      *pstr = str;
-+      return 1;
-+   }
-+   else
-+   {
-+      /* no */
-+      return 0;
-+   }
-+}
-+
-+const char *vcos_log_level_to_string( VCOS_LOG_LEVEL_T level )
-+{
-+   switch (level)
-+   {
-+      case VCOS_LOG_UNINITIALIZED:  return "uninit";
-+      case VCOS_LOG_NEVER:          return "never";
-+      case VCOS_LOG_ERROR:          return "error";
-+      case VCOS_LOG_WARN:           return "warn";
-+      case VCOS_LOG_INFO:           return "info";
-+      case VCOS_LOG_TRACE:          return "trace";
-+   }
-+   return "???";
-+}
-+
-+VCOS_STATUS_T vcos_string_to_log_level( const char *str, VCOS_LOG_LEVEL_T *level )
-+{
-+   if (strcmp(str,"error") == 0)
-+      *level = VCOS_LOG_ERROR;
-+   else if (strcmp(str,"never") == 0)
-+      *level = VCOS_LOG_NEVER;
-+   else if (strcmp(str,"warn") == 0)
-+      *level = VCOS_LOG_WARN;
-+   else if (strcmp(str,"warning") == 0)
-+      *level = VCOS_LOG_WARN;
-+   else if (strcmp(str,"info") == 0)
-+      *level = VCOS_LOG_INFO;
-+   else if (strcmp(str,"trace") == 0)
-+      *level = VCOS_LOG_TRACE;
-+   else
-+      return VCOS_EINVAL;
-+
-+   return VCOS_SUCCESS;
-+}
-+
-+static int read_level(VCOS_LOG_LEVEL_T *level, const char **pstr, char sep)
-+{
-+   char buf[16];
-+   int ret = 1;
-+   if (read_tok(buf,sizeof(buf),pstr,sep))
-+   {
-+      if (vcos_string_to_log_level(buf,level) != VCOS_SUCCESS)
-+      {
-+         vcos_log("Invalid trace level '%s'\n", buf);
-+         ret = 0;
-+      }
-+   }
-+   else
-+   {
-+      ret = 0;
-+   }
-+   return ret;
-+}
-+
-+void vcos_log_register(const char *name, VCOS_LOG_CAT_T *category)
-+{
-+   const char *env;
-+   VCOS_LOG_CAT_T *i;
-+
-+   category->name  = name;
-+   if ( category->level == VCOS_LOG_UNINITIALIZED )
-+   {
-+      category->level = VCOS_LOG_ERROR;
-+   }
-+   category->flags.want_prefix = (category != &dflt_log_category );
-+
-+   vcos_mutex_lock(&lock);
-+
-+   /* is it already registered? */
-+   for (i = vcos_logging_categories; i ; i = i->next )
-+   {
-+      if (i == category)
-+      {
-+         i->refcount++;
-+         break;
-+      }
-+   }
-+
-+   if (!i)
-+   {
-+      /* not yet registered */
-+      category->next = vcos_logging_categories;
-+      vcos_logging_categories = category;
-+      category->refcount++;
-+
-+      vcos_log_platform_register(category);
-+   }
-+
-+   vcos_mutex_unlock(&lock);
-+
-+   /* Check to see if this log level has been enabled. Look for
-+    * (<category:level>,)*
-+    *
-+    * VC_LOGLEVEL=ilcs:info,vchiq:warn
-+    */
-+
-+   env = _VCOS_LOG_LEVEL();
-+   if (env)
-+   {
-+      do
-+      {
-+         char env_name[64];
-+         VCOS_LOG_LEVEL_T level;
-+         if (read_tok(env_name, sizeof(env_name), &env, ':') &&
-+             read_level(&level, &env, ','))
-+         {
-+            if (strcmp(env_name, name) == 0)
-+            {
-+               category->level = level;
-+               break;
-+            }
-+         }
-+         else
-+         {
-+            if (!warned_loglevel)
-+            {
-+                vcos_log("VC_LOGLEVEL format invalid at %s\n", env);
-+                warned_loglevel = 1;
-+            }
-+            return;
-+         }
-+      } while (env[0] != '\0');
-+   }
-+
-+   vcos_log_info( "Registered log category '%s' with level %s",
-+                  category->name,
-+                  vcos_log_level_to_string( category->level ));
-+}
-+
-+void vcos_log_unregister(VCOS_LOG_CAT_T *category)
-+{
-+   VCOS_LOG_CAT_T **pcat;
-+   vcos_mutex_lock(&lock);
-+   category->refcount--;
-+   if (category->refcount == 0)
-+   {
-+      pcat = &vcos_logging_categories;
-+      while (*pcat != category)
-+      {
-+         if (!*pcat)
-+            break;   /* possibly deregistered twice? */
-+         if ((*pcat)->next == NULL)
-+         {
-+            vcos_assert(0); /* already removed! */
-+            vcos_mutex_unlock(&lock);
-+            return;
-+         }
-+         pcat = &(*pcat)->next;
-+      }
-+      if (*pcat)
-+         *pcat = category->next;
-+
-+      vcos_log_platform_unregister(category);
-+   }
-+   vcos_mutex_unlock(&lock);
-+}
-+
-+VCOSPRE_ const VCOS_LOG_CAT_T * VCOSPOST_ vcos_log_get_default_category(void)
-+{
-+   return &dflt_log_category;
-+}
-+
-+void vcos_set_log_options(const char *opt)
-+{
-+   (void)opt;
-+}
-+
-+void vcos_log_dump_mem_impl( const VCOS_LOG_CAT_T *cat,
-+                             const char           *label,
-+                             uint32_t              addr,
-+                             const void           *voidMem,
-+                             size_t                numBytes )
-+{
-+   const uint8_t  *mem = (const uint8_t *)voidMem;
-+   size_t          offset;
-+   char            lineBuf[ 100 ];
-+   char           *s;
-+
-+   while ( numBytes > 0 )
-+   {
-+       s = lineBuf;
-+
-+       for ( offset = 0; offset < 16; offset++ )
-+       {
-+           if ( offset < numBytes )
-+           {
-+               s += vcos_snprintf( s, 4, "%02x ", mem[ offset ]);
-+           }
-+           else
-+           {
-+               s += vcos_snprintf( s, 4, "   " );
-+           }
-+       }
-+
-+       for ( offset = 0; offset < 16; offset++ )
-+       {
-+           if ( offset < numBytes )
-+           {
-+               uint8_t ch = mem[ offset ];
-+
-+               if (( ch < ' ' ) || ( ch > '~' ))
-+               {
-+                   ch = '.';
-+               }
-+               *s++ = (char)ch;
-+           }
-+       }
-+       *s++ = '\0';
-+
-+       if (( label != NULL ) && ( *label != '\0' ))
-+       {
-+          vcos_log_impl( cat, VCOS_LOG_INFO, "%s: %08x: %s", label, addr, lineBuf );
-+       }
-+       else
-+       {
-+          vcos_log_impl( cat, VCOS_LOG_INFO, "%08x: %s", addr, lineBuf );
-+       }
-+
-+       addr += 16;
-+       mem += 16;
-+       if ( numBytes > 16 )
-+       {
-+           numBytes -= 16;
-+       }
-+       else
-+       {
-+           numBytes = 0;
-+       }
-+   }
-+
-+}
-+
-+void vcos_log_impl(const VCOS_LOG_CAT_T *cat, VCOS_LOG_LEVEL_T _level, const char *fmt, ...)
-+{
-+   va_list ap;
-+   va_start(ap,fmt);
-+   vcos_vlog_impl( cat, _level, fmt, ap );
-+   va_end(ap);
-+}
-+
-+void vcos_vlog_impl(const VCOS_LOG_CAT_T *cat, VCOS_LOG_LEVEL_T _level, const char *fmt, va_list args)
-+{
-+   vcos_vlog_impl_func( cat, _level, fmt, args );
-+}
-+
-+void vcos_set_vlog_impl( VCOS_VLOG_IMPL_FUNC_T vlog_impl_func )
-+{
-+   if ( vlog_impl_func == NULL )
-+   {
-+      vcos_vlog_impl_func = vcos_vlog_default_impl;
-+   }
-+   else
-+   {
-+      vcos_vlog_impl_func = vlog_impl_func;
-+   }
-+}
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - memory alloc implementation
-+=============================================================================*/
-+
-+#include "interface/vcos/vcos.h"
-+
-+#ifndef _vcos_platform_malloc
-+#include <stdlib.h>
-+#define _vcos_platform_malloc malloc
-+#define _vcos_platform_free   free
-+#endif
-+
-+typedef struct malloc_header_s {
-+   uint32_t guardword;
-+   uint32_t size;
-+   const char *description;
-+   void *ptr;
-+} MALLOC_HEADER_T;
-+
-+
-+#define MIN_ALIGN sizeof(MALLOC_HEADER_T)
-+
-+#define GUARDWORDHEAP  0xa55a5aa5
-+
-+void *vcos_generic_mem_alloc_aligned(VCOS_UNSIGNED size, VCOS_UNSIGNED align, const char *desc)
-+{
-+   int local_align = align == 0 ? 1 : align;
-+   int required_size = size + local_align + sizeof(MALLOC_HEADER_T);
-+   void *ptr = _vcos_platform_malloc(required_size);
-+   void *ret = (void *)VCOS_ALIGN_UP(((char *)ptr)+sizeof(MALLOC_HEADER_T), local_align);
-+   MALLOC_HEADER_T *h = ((MALLOC_HEADER_T *)ret)-1;
-+
-+   h->size = size;
-+   h->description = desc;
-+   h->guardword = GUARDWORDHEAP;
-+   h->ptr = ptr;
-+
-+   return ret;
-+}
-+
-+void *vcos_generic_mem_alloc(VCOS_UNSIGNED size, const char *desc)
-+{
-+   return vcos_generic_mem_alloc_aligned(size,MIN_ALIGN,desc);
-+}
-+
-+void *vcos_generic_mem_calloc(VCOS_UNSIGNED count, VCOS_UNSIGNED sz, const char *desc)
-+{
-+   uint32_t size = count*sz;
-+   void *ptr = vcos_generic_mem_alloc_aligned(size,MIN_ALIGN,desc);
-+   if (ptr)
-+   {
-+      memset(ptr, 0, size);
-+   }
-+   return ptr;
-+}
-+
-+void vcos_generic_mem_free(void *ptr)
-+{
-+   MALLOC_HEADER_T *h;
-+   if (! ptr) return;
-+
-+   h = ((MALLOC_HEADER_T *)ptr)-1;
-+   vcos_assert(h->guardword == GUARDWORDHEAP);
-+   _vcos_platform_free(h->ptr);
-+}
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,65 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+Create the vcos_malloc API from the regular system malloc/free
-+=============================================================================*/
-+
-+/**
-+  * \file
-+  *
-+  * Create the vcos malloc API from a regular system malloc/free library.
-+  *
-+  * The API lets callers specify an alignment.
-+  *
-+  * Under VideoCore this is not needed, as we can simply use the rtos_malloc routines.
-+  * But on host platforms that won't be the case.
-+  *
-+  */
-+
-+VCOSPRE_ void * VCOSPOST_  vcos_generic_mem_alloc(VCOS_UNSIGNED sz, const char *desc);
-+VCOSPRE_  void * VCOSPOST_ vcos_generic_mem_calloc(VCOS_UNSIGNED count, VCOS_UNSIGNED sz, const char *descr);
-+VCOSPRE_  void VCOSPOST_   vcos_generic_mem_free(void *ptr);
-+VCOSPRE_  void * VCOSPOST_ vcos_generic_mem_alloc_aligned(VCOS_UNSIGNED sz, VCOS_UNSIGNED align, const char *desc);
-+
-+#ifdef VCOS_INLINE_BODIES
-+
-+VCOS_INLINE_IMPL
-+void *vcos_malloc(VCOS_UNSIGNED size, const char *description) {
-+   return vcos_generic_mem_alloc(size, description);
-+}
-+
-+VCOS_INLINE_IMPL
-+void *vcos_calloc(VCOS_UNSIGNED num, VCOS_UNSIGNED size, const char *description) {
-+   return vcos_generic_mem_calloc(num, size, description);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_free(void *ptr) {
-+   vcos_generic_mem_free(ptr);
-+}
-+
-+VCOS_INLINE_IMPL
-+void * vcos_malloc_aligned(VCOS_UNSIGNED size, VCOS_UNSIGNED align, const char *description) {
-+   return vcos_generic_mem_alloc_aligned(size, align, description);
-+}
-+
-+
-+#endif /* VCOS_INLINE_BODIES */
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,79 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - reentrant mutexes mapped directly to regular ones
-+=============================================================================*/
-+
-+#ifndef VCOS_GENERIC_REENTRANT_MUTEX_H
-+#define VCOS_GENERIC_REENTRANT_MUTEX_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "interface/vcos/vcos_mutex.h"
-+
-+/**
-+ * \file
-+ *
-+ * Reentrant Mutexes directly using the native re-entrant mutex.
-+ *
-+ */
-+
-+typedef VCOS_MUTEX_T VCOS_REENTRANT_MUTEX_T;
-+
-+/* Inline forwarding functions */
-+
-+#if defined(VCOS_INLINE_BODIES)
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_reentrant_mutex_create(VCOS_REENTRANT_MUTEX_T *m, const char *name) {
-+   return vcos_mutex_create(m,name);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_reentrant_mutex_delete(VCOS_REENTRANT_MUTEX_T *m) {
-+   vcos_mutex_delete(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_reentrant_mutex_lock(VCOS_REENTRANT_MUTEX_T *m) {
-+   vcos_mutex_lock(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_reentrant_mutex_unlock(VCOS_REENTRANT_MUTEX_T *m) {
-+   vcos_mutex_unlock(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+int vcos_reentrant_mutex_is_locked(VCOS_REENTRANT_MUTEX_T *m) {
-+   return vcos_mutex_is_locked(m);
-+}
-+
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,46 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - thread reaping
-+=============================================================================*/
-+
-+#ifndef VCOS_THREAD_REAPER_H
-+#define VCOS_THREAD_REAPER_H
-+
-+#define VCOS_HAVE_THREAD_REAPER
-+
-+/** Initialise the thread reaper.
-+  */
-+VCOS_STATUS_T vcos_thread_reaper_init(void);
-+
-+/** Reap a thread. Arranges for the thread to be automatically
-+  * joined.
-+  *
-+  * @sa vcos_thread_join().
-+  *
-+  * @param thread           the thread to terminate
-+  * @param on_terminated    called after the thread has exited
-+  * @param cxt              pass back to the callback
-+  *
-+  */
-+void vcos_thread_reap(VCOS_THREAD_T *thread, void (*on_terminated)(void*), void *cxt);
-+
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,31 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS fAbstraction Layer - stdint.h C standard header
-+=============================================================================*/
-+
-+#ifndef _VCOS_PLATFORM_LINUX_STDINT_H
-+#define _VCOS_PLATFORM_LINUX_STDINT_H
-+
-+/* The Linux kernel does not have a <stdint.h> so we have to provide one of
-+   our own. */
-+
-+#include <linux/types.h> /* includes integer types */
-+
-+#endif /* _VCOS_PLATFORM_LINUX_STDINT_H */
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,627 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - pthreads types
-+=============================================================================*/
-+
-+#define  VCOS_INLINE_BODIES
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/time.h>
-+#include <linux/pid.h>
-+#include <linux/mm.h>
-+#include <linux/version.h>
-+
-+#if defined( CONFIG_BCM_KNLLOG_SUPPORT )
-+#include <linux/broadcom/knllog.h>
-+#endif
-+#include "interface/vcos/vcos.h"
-+#ifdef HAVE_VCOS_VERSION
-+#include "interface/vcos/vcos_build_info.h"
-+#endif
-+
-+VCOS_CFG_ENTRY_T  vcos_cfg_dir;
-+VCOS_CFG_ENTRY_T  vcos_logging_cfg_dir;
-+VCOS_CFG_ENTRY_T  vcos_version_cfg;
-+
-+#ifndef VCOS_DEFAULT_STACK_SIZE
-+#define VCOS_DEFAULT_STACK_SIZE 4096
-+#endif
-+
-+static VCOS_THREAD_ATTR_T default_attrs = {
-+   0,
-+   VCOS_DEFAULT_STACK_SIZE,
-+};
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+static DEFINE_SEMAPHORE(lock);
-+#else
-+static DECLARE_MUTEX(lock);
-+#endif
-+
-+typedef void (*LEGACY_ENTRY_FN_T)(int, void *);
-+
-+/** Wrapper function around the real thread function. Posts the semaphore
-+  * when completed.
-+  */
-+static int vcos_thread_wrapper(void *arg)
-+{
-+   void *ret;
-+   VCOS_THREAD_T *thread = arg;
-+
-+   vcos_assert(thread->magic == VCOS_THREAD_MAGIC);
-+
-+   thread->thread.thread = current;
-+
-+   vcos_add_thread(thread);
-+
-+#ifdef VCOS_WANT_TLS_EMULATION
-+   vcos_tls_thread_register(&thread->_tls);
-+#endif
-+
-+   if (thread->legacy)
-+   {
-+      LEGACY_ENTRY_FN_T fn = (LEGACY_ENTRY_FN_T)thread->entry;
-+      fn(0,thread->arg);
-+      ret = 0;
-+   }
-+   else
-+   {
-+      ret = thread->entry(thread->arg);
-+   }
-+
-+   thread->exit_data = ret;
-+
-+   vcos_remove_thread(current);
-+
-+   /* For join and cleanup */
-+   vcos_semaphore_post(&thread->wait);
-+
-+   return 0;
-+}
-+
-+VCOS_STATUS_T vcos_thread_create(VCOS_THREAD_T *thread,
-+                                 const char *name,
-+                                 VCOS_THREAD_ATTR_T *attrs,
-+                                 VCOS_THREAD_ENTRY_FN_T entry,
-+                                 void *arg)
-+{
-+   VCOS_STATUS_T st;
-+   struct task_struct *kthread;
-+
-+   memset(thread, 0, sizeof(*thread));
-+   thread->magic     = VCOS_THREAD_MAGIC;
-+   strlcpy( thread->name, name, sizeof( thread->name ));
-+   thread->legacy    = attrs ? attrs->legacy : 0;
-+   thread->entry = entry;
-+   thread->arg = arg;
-+
-+   if (!name)
-+   {
-+      vcos_assert(0);
-+      return VCOS_EINVAL;
-+   }
-+
-+   st = vcos_semaphore_create(&thread->wait, NULL, 0);
-+   if (st != VCOS_SUCCESS)
-+   {
-+      return st;
-+   }
-+
-+   st = vcos_semaphore_create(&thread->suspend, NULL, 0);
-+   if (st != VCOS_SUCCESS)
-+   {
-+      return st;
-+   }
-+
-+   /*required for event groups */
-+   vcos_timer_create(&thread->_timer.timer, thread->name, NULL, NULL);
-+
-+   kthread = kthread_create((int (*)(void *))vcos_thread_wrapper, (void*)thread, name);
-+   vcos_assert(kthread != NULL);
-+   set_user_nice(kthread, attrs->ta_priority);
-+   thread->thread.thread = kthread;
-+   wake_up_process(kthread);
-+   return VCOS_SUCCESS;
-+}
-+
-+void vcos_thread_join(VCOS_THREAD_T *thread,
-+                             void **pData)
-+{
-+   vcos_assert(thread);
-+   vcos_assert(thread->magic == VCOS_THREAD_MAGIC);
-+
-+   thread->joined = 1;
-+
-+   vcos_semaphore_wait(&thread->wait);
-+
-+   if (pData)
-+   {
-+      *pData = thread->exit_data;
-+   }
-+
-+   /* Clean up */
-+   if (thread->stack)
-+      vcos_free(thread->stack);
-+
-+   vcos_semaphore_delete(&thread->wait);
-+   vcos_semaphore_delete(&thread->suspend);
-+
-+}
-+
-+uint32_t vcos_getmicrosecs( void )
-+{
-+   struct timeval tv;
-+/*XXX FIX ME! switch to ktime_get_ts to use MONOTONIC clock */
-+   do_gettimeofday(&tv);
-+   return (tv.tv_sec*1000000) + tv.tv_usec;
-+}
-+
-+VCOS_STATUS_T vcos_timer_init(void)
-+{
-+    return VCOS_SUCCESS;
-+}
-+
-+static const char *log_prefix[] =
-+{
-+   "",            /* VCOS_LOG_UNINITIALIZED */
-+   "",            /* VCOS_LOG_NEVER */
-+   KERN_ERR,      /* VCOS_LOG_ERROR */
-+   KERN_WARNING,  /* VCOS_LOG_WARN */
-+   KERN_INFO,     /* VCOS_LOG_INFO */
-+   KERN_INFO      /* VCOS_LOG_TRACE */
-+};
-+
-+void vcos_vlog_default_impl(const VCOS_LOG_CAT_T *cat, VCOS_LOG_LEVEL_T _level, const char *fmt, va_list args)
-+{
-+   char *newline = strchr( fmt, '\n' );
-+   const char  *prefix;
-+   const char  *real_fmt;
-+
-+   preempt_disable();
-+   {
-+       if ( *fmt == '<' )
-+       {
-+           prefix = fmt;
-+           real_fmt= &fmt[3];
-+       }
-+       else
-+       {
-+          prefix = log_prefix[_level];
-+          real_fmt = fmt;
-+       }
-+#if defined( CONFIG_BCM_KNLLOG_SUPPORT )
-+       knllog_ventry( "vcos", real_fmt, args );
-+#endif
-+       printk( "%.3svcos: [%d]: ", prefix, current->pid );
-+       vprintk( real_fmt, args );
-+
-+       if ( newline == NULL )
-+       {
-+          printk("\n");
-+       }
-+   }
-+   preempt_enable();
-+}
-+
-+
-+const char * _vcos_log_level(void)
-+{
-+   return NULL;
-+}
-+
-+/*****************************************************************************
-+*
-+*    Displays the version information in /proc/vcos/version
-+*
-+*****************************************************************************/
-+
-+#ifdef HAVE_VCOS_VERSION
-+
-+static void show_version( VCOS_CFG_BUF_T buf, void *data )
-+{
-+   static const char* copyright = "Copyright (c) 2011 Broadcom";
-+
-+   vcos_cfg_buf_printf( buf, "Built %s %s on %s\n%s\nversion %s\n",
-+                        vcos_get_build_date(),
-+                        vcos_get_build_time(),
-+                        vcos_get_build_hostname(),
-+                        copyright,
-+                        vcos_get_build_version() );
-+}
-+
-+#endif
-+
-+/*****************************************************************************
-+*
-+*    Initialises vcos
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_init(void)
-+{
-+   if ( vcos_cfg_mkdir( &vcos_cfg_dir, NULL, "vcos" ) != VCOS_SUCCESS )
-+   {
-+      printk( KERN_ERR "%s: Unable to create vcos cfg entry\n", __func__ );
-+   }
-+   vcos_logging_init();
-+
-+#ifdef HAVE_VCOS_VERSION
-+   if ( vcos_cfg_create_entry( &vcos_version_cfg, &vcos_cfg_dir, "version",
-+                               show_version, NULL, NULL ) != VCOS_SUCCESS )
-+   {
-+      printk( KERN_ERR "%s: Unable to create vcos cfg entry 'version'\n", __func__ );
-+   }
-+#endif
-+
-+   return VCOS_SUCCESS;
-+}
-+
-+/*****************************************************************************
-+*
-+*    Deinitializes vcos
-+*
-+*****************************************************************************/
-+
-+void vcos_deinit(void)
-+{
-+#ifdef HAVE_VCOS_VERSION
-+   vcos_cfg_remove_entry( &vcos_version_cfg );
-+#endif
-+   vcos_cfg_remove_entry( &vcos_cfg_dir );
-+}
-+
-+void vcos_global_lock(void)
-+{
-+   down(&lock);
-+}
-+
-+void vcos_global_unlock(void)
-+{
-+   up(&lock);
-+}
-+
-+/* vcos_thread_exit() doesn't really stop this thread here
-+ *
-+ * At the moment, call to do_exit() will leak task_struct for
-+ * current thread, so we let the vcos_thread_wrapper() do the
-+ * cleanup and exit job, and we return w/o actually stopping the thread.
-+ *
-+ * ToDo: Kernel v2.6.31 onwards, it is considered safe to call do_exit()
-+ * from kthread, the implementation of which is combined in 2 patches
-+ * with commit-ids "63706172" and "cdd140bd" in oss Linux kernel tree
-+ */
-+
-+void vcos_thread_exit(void *arg)
-+{
-+   VCOS_THREAD_T *thread = vcos_thread_current();
-+
-+   vcos_assert(thread);
-+   vcos_assert(thread->magic == VCOS_THREAD_MAGIC);
-+
-+   thread->exit_data = arg;
-+}
-+
-+void vcos_thread_attr_init(VCOS_THREAD_ATTR_T *attrs)
-+{
-+   *attrs = default_attrs;
-+}
-+
-+void _vcos_task_timer_set(void (*pfn)(void *), void *cxt, VCOS_UNSIGNED ms)
-+{
-+   VCOS_THREAD_T *self = vcos_thread_current();
-+   vcos_assert(self);
-+   vcos_assert(self->_timer.pfn == NULL);
-+
-+   vcos_timer_create( &self->_timer.timer, "TaskTimer", pfn, cxt );
-+   vcos_timer_set(&self->_timer.timer, ms);
-+}
-+
-+void _vcos_task_timer_cancel(void)
-+{
-+   VCOS_THREAD_T *self = vcos_thread_current();
-+   if (self->_timer.timer.linux_timer.function)
-+   {
-+      vcos_timer_cancel(&self->_timer.timer);
-+      vcos_timer_delete(&self->_timer.timer);
-+   }
-+}
-+
-+int vcos_vsnprintf( char *buf, size_t buflen, const char *fmt, va_list ap )
-+{
-+   return vsnprintf( buf, buflen, fmt, ap );
-+}
-+
-+int vcos_snprintf(char *buf, size_t buflen, const char *fmt, ...)
-+{
-+   int ret;
-+   va_list ap;
-+   va_start(ap,fmt);
-+   ret = vsnprintf(buf, buflen, fmt, ap);
-+   va_end(ap);
-+   return ret;
-+}
-+
-+int vcos_llthread_running(VCOS_LLTHREAD_T *t) {
-+   vcos_assert(0);   /* this function only exists as a nasty hack for the video codecs! */
-+   return 1;
-+}
-+
-+static int vcos_verify_bkpts = 1;
-+
-+int vcos_verify_bkpts_enabled(void)
-+{
-+   return vcos_verify_bkpts;
-+}
-+
-+/*****************************************************************************
-+*
-+*    _vcos_log_platform_init is called from vcos_logging_init
-+*
-+*****************************************************************************/
-+
-+void _vcos_log_platform_init(void)
-+{
-+   if ( vcos_cfg_mkdir( &vcos_logging_cfg_dir, &vcos_cfg_dir, "logging" ) != VCOS_SUCCESS )
-+   {
-+      printk( KERN_ERR "%s: Unable to create logging cfg entry\n", __func__ );
-+   }
-+}
-+
-+/*****************************************************************************
-+*
-+*    Called to display the contents of a logging category.
-+*
-+*****************************************************************************/
-+
-+static void logging_show_category( VCOS_CFG_BUF_T buf, void *data )
-+{
-+   VCOS_LOG_CAT_T *category = data;
-+
-+   vcos_cfg_buf_printf( buf, "%s\n", vcos_log_level_to_string( category->level ));
-+}
-+
-+/*****************************************************************************
-+*
-+*    Called to parse content for a logging category.
-+*
-+*****************************************************************************/
-+
-+static void logging_parse_category( VCOS_CFG_BUF_T buf, void *data )
-+{
-+   VCOS_LOG_CAT_T *category = data;
-+   const char *str = vcos_cfg_buf_get_str( buf );
-+   VCOS_LOG_LEVEL_T  level;
-+
-+   if ( vcos_string_to_log_level( str, &level ) == VCOS_SUCCESS )
-+   {
-+      category->level = level;
-+   }
-+   else
-+   {
-+      printk( KERN_ERR "%s: Unrecognized logging level: '%s'\n",
-+              __func__, str );
-+   }
-+}
-+
-+/*****************************************************************************
-+*
-+*    _vcos_log_platform_register is called from vcos_log_register whenever
-+*    a new category is registered.
-+*
-+*****************************************************************************/
-+
-+void _vcos_log_platform_register(VCOS_LOG_CAT_T *category)
-+{
-+   VCOS_CFG_ENTRY_T  entry;
-+
-+   if ( vcos_cfg_create_entry( &entry, &vcos_logging_cfg_dir, category->name,
-+                               logging_show_category, logging_parse_category,
-+                               category ) != VCOS_SUCCESS )
-+   {
-+      printk( KERN_ERR "%s: Unable to create cfg entry for logging category '%s'\n",
-+              __func__, category->name );
-+      category->platform_data = NULL;
-+   }
-+   else
-+   {
-+      category->platform_data = entry;
-+   }
-+}
-+
-+/*****************************************************************************
-+*
-+*    _vcos_log_platform_unregister is called from vcos_log_unregister whenever
-+*    a new category is unregistered.
-+*
-+*****************************************************************************/
-+
-+void _vcos_log_platform_unregister(VCOS_LOG_CAT_T *category)
-+{
-+   VCOS_CFG_ENTRY_T  entry;
-+
-+   entry = category->platform_data;
-+   if ( entry != NULL )
-+   {
-+      if ( vcos_cfg_remove_entry( &entry ) != VCOS_SUCCESS )
-+      {
-+         printk( KERN_ERR "%s: Unable to remove cfg entry for logging category '%s'\n",
-+                 __func__, category->name );
-+      }
-+   }
-+}
-+
-+/*****************************************************************************
-+*
-+*    Allocate memory.
-+*
-+*****************************************************************************/
-+
-+void *vcos_platform_malloc( VCOS_UNSIGNED required_size )
-+{
-+   if ( required_size >= ( 2 * PAGE_SIZE ))
-+   {
-+      /* For larger allocations, use vmalloc, whose underlying allocator
-+       * returns pages
-+       */
-+
-+      return vmalloc( required_size );
-+   }
-+
-+   /* For smaller allocation, use kmalloc */
-+
-+   return kmalloc( required_size, GFP_KERNEL );
-+}
-+
-+/*****************************************************************************
-+*
-+*    Free previously allocated memory
-+*
-+*****************************************************************************/
-+
-+void  vcos_platform_free( void *ptr )
-+{
-+   if (((unsigned long)ptr >= VMALLOC_START )
-+   &&  ((unsigned long)ptr < VMALLOC_END ))
-+   {
-+      vfree( ptr );
-+   }
-+   else
-+   {
-+      kfree( ptr );
-+   }
-+}
-+
-+/*****************************************************************************
-+*
-+*    Execute a routine exactly once.
-+*
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_once(VCOS_ONCE_T *once_control,
-+                        void (*init_routine)(void))
-+{
-+   /* In order to be thread-safe we need to re-test *once_control
-+    * inside the lock. The outer test is basically an optimization
-+    * so that once it is initialized we don't need to waste time
-+    * trying to acquire the lock.
-+    */
-+
-+   if ( *once_control == 0 )
-+   {
-+       vcos_global_lock();
-+       if ( *once_control == 0 )
-+       {
-+           init_routine();
-+           *once_control = 1;
-+       }
-+       vcos_global_unlock();
-+   }
-+
-+   return VCOS_SUCCESS;
-+}
-+
-+/*****************************************************************************
-+*
-+*    String duplication routine.
-+*
-+*****************************************************************************/
-+
-+char *vcos_strdup(const char *str)
-+{
-+    return kstrdup(str, GFP_KERNEL);
-+}
-+
-+
-+/* Export functions for modules to use */
-+EXPORT_SYMBOL( vcos_init );
-+
-+EXPORT_SYMBOL( vcos_semaphore_trywait );
-+EXPORT_SYMBOL( vcos_semaphore_post );
-+EXPORT_SYMBOL( vcos_semaphore_create );
-+EXPORT_SYMBOL( vcos_semaphore_wait );
-+EXPORT_SYMBOL( vcos_semaphore_delete );
-+
-+EXPORT_SYMBOL( vcos_log_impl );
-+EXPORT_SYMBOL( vcos_vlog_impl );
-+EXPORT_SYMBOL( vcos_vlog_default_impl );
-+EXPORT_SYMBOL( vcos_log_get_default_category );
-+EXPORT_SYMBOL( vcos_log_register );
-+EXPORT_SYMBOL( vcos_log_unregister );
-+EXPORT_SYMBOL( vcos_logging_init );
-+EXPORT_SYMBOL( vcos_log_level_to_string );
-+EXPORT_SYMBOL( vcos_string_to_log_level );
-+EXPORT_SYMBOL( vcos_log_dump_mem_impl );
-+
-+EXPORT_SYMBOL( vcos_event_create );
-+EXPORT_SYMBOL( vcos_event_delete );
-+EXPORT_SYMBOL( vcos_event_flags_set );
-+EXPORT_SYMBOL( vcos_event_signal );
-+EXPORT_SYMBOL( vcos_event_wait );
-+EXPORT_SYMBOL( vcos_event_try );
-+
-+EXPORT_SYMBOL( vcos_getmicrosecs );
-+
-+EXPORT_SYMBOL( vcos_strcasecmp );
-+EXPORT_SYMBOL( vcos_snprintf );
-+EXPORT_SYMBOL( vcos_vsnprintf );
-+
-+EXPORT_SYMBOL( vcos_thread_current );
-+EXPORT_SYMBOL( vcos_thread_join );
-+EXPORT_SYMBOL( vcos_thread_create );
-+EXPORT_SYMBOL( vcos_thread_set_priority );
-+EXPORT_SYMBOL( vcos_thread_exit );
-+EXPORT_SYMBOL( vcos_once );
-+
-+EXPORT_SYMBOL( vcos_thread_attr_init );
-+EXPORT_SYMBOL( vcos_thread_attr_setpriority );
-+EXPORT_SYMBOL( vcos_thread_attr_settimeslice );
-+EXPORT_SYMBOL( vcos_thread_attr_setstacksize );
-+EXPORT_SYMBOL( _vcos_thread_attr_setlegacyapi );
-+
-+EXPORT_SYMBOL( vcos_event_flags_create );
-+EXPORT_SYMBOL( vcos_event_flags_delete );
-+EXPORT_SYMBOL( vcos_event_flags_get );
-+
-+EXPORT_SYMBOL( vcos_sleep );
-+
-+EXPORT_SYMBOL( vcos_calloc );
-+EXPORT_SYMBOL( vcos_malloc );
-+EXPORT_SYMBOL( vcos_malloc_aligned );
-+EXPORT_SYMBOL( vcos_free );
-+
-+EXPORT_SYMBOL( vcos_mutex_create );
-+EXPORT_SYMBOL( vcos_mutex_delete );
-+EXPORT_SYMBOL( vcos_mutex_lock );
-+EXPORT_SYMBOL( vcos_mutex_unlock );
-+EXPORT_SYMBOL( vcos_mutex_trylock );
-+
-+EXPORT_SYMBOL( vcos_timer_cancel );
-+EXPORT_SYMBOL( vcos_timer_create );
-+EXPORT_SYMBOL( vcos_timer_delete );
-+EXPORT_SYMBOL( vcos_timer_set );
-+
-+EXPORT_SYMBOL( vcos_atomic_flags_create );
-+EXPORT_SYMBOL( vcos_atomic_flags_delete );
-+EXPORT_SYMBOL( vcos_atomic_flags_or );
-+EXPORT_SYMBOL( vcos_atomic_flags_get_and_clear );
-+
-+EXPORT_SYMBOL( vcos_verify_bkpts_enabled );
-+
-+EXPORT_SYMBOL( vcos_strdup );
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,332 @@
-+/*****************************************************************************
-+* Copyright 2009 - 2010 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+*****************************************************************************/
-+
-+#include "interface/vcos/vcos.h"
-+#include <linux/module.h>
-+#include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
-+#include <asm/uaccess.h>
-+
-+struct opaque_vcos_cfg_buf_t
-+{
-+    struct seq_file *seq;
-+    char            *charBuf;
-+};
-+
-+struct opaque_vcos_cfg_entry_t
-+{
-+    struct proc_dir_entry *pde;
-+    struct proc_dir_entry *parent_pde;
-+    VCOS_CFG_SHOW_FPTR     showFunc;
-+    VCOS_CFG_PARSE_FPTR    parseFunc;
-+    void                  *data;
-+    const char            *name;
-+};
-+
-+/***************************************************************************** 
-+* 
-+*    cfg_proc_show
-+*  
-+*****************************************************************************/
-+
-+static int cfg_proc_show( struct seq_file *s, void *v )
-+{
-+    VCOS_CFG_ENTRY_T                entry;
-+    struct opaque_vcos_cfg_buf_t    buf;
-+
-+    entry = s->private;
-+
-+    if ( entry->showFunc )
-+    {
-+        memset( &buf, 0, sizeof( buf ));
-+        buf.seq = s;
-+
-+        entry->showFunc( &buf, entry->data );
-+    }
-+
-+    return 0;
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    cfg_proc_write
-+*  
-+*****************************************************************************/
-+
-+static ssize_t cfg_proc_write( struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
-+{
-+    VCOS_CFG_ENTRY_T                entry = PDE(file->f_path.dentry->d_inode)->data;
-+    char                           *charBuf;
-+    struct opaque_vcos_cfg_buf_t    buf;
-+    size_t                          len;
-+
-+    if ( entry->parseFunc != NULL )
-+    {
-+        /* The number 4000 is rather arbitrary. It just needs to be bigger than any input
-+         * string we expect to use.
-+         */
-+
-+        len = count;
-+        if ( count > 4000 )
-+        {
-+            len = 4000;
-+        }
-+
-+        /* Allocate a kernel buffer to contain the string being written. */
-+
-+        charBuf = kmalloc( len + 1, GFP_KERNEL );
-+        if ( copy_from_user( charBuf, buffer, len ))
-+        {
-+            kfree( charBuf );
-+            return -EFAULT;
-+        }
-+
-+        /* echo puts a trailing newline in the buffer - strip it out. */
-+
-+        if (( len > 0 ) && ( charBuf[ len - 1 ] == '\n' ))
-+        {
-+            len--;
-+        }
-+        charBuf[len] = '\0';
-+
-+        memset( &buf, 0, sizeof( buf ));
-+        buf.charBuf = charBuf;
-+
-+        entry->parseFunc( &buf, entry->data );
-+        kfree( charBuf );
-+    }
-+    return count;
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    cfg_proc_open
-+*  
-+*****************************************************************************/
-+
-+static int cfg_proc_open( struct inode *inode, struct file *file )
-+{
-+    return single_open( file, cfg_proc_show, PDE(inode)->data );
-+}
-+
-+static const struct file_operations cfg_proc_fops = 
-+{
-+    .open       = cfg_proc_open,
-+    .read       = seq_read,
-+    .llseek     = seq_lseek,
-+    .release    = single_release,
-+    .write      = cfg_proc_write,
-+};
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_mkdir
-+*  
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_cfg_mkdir( VCOS_CFG_ENTRY_T *entryp,
-+                              VCOS_CFG_ENTRY_T *parent,
-+                              const char *dirName )
-+{
-+    VCOS_CFG_ENTRY_T    entry;
-+
-+    if (( entry = kzalloc( sizeof( *entry ), GFP_KERNEL )) == NULL )
-+    {
-+        return VCOS_ENOMEM;
-+    }
-+
-+    if ( parent == NULL )
-+    {
-+        entry->pde = proc_mkdir( dirName, NULL );
-+    }
-+    else
-+    {
-+        entry->pde = proc_mkdir( dirName, (*parent)->pde );
-+        entry->parent_pde = (*parent)->pde;
-+    }
-+    if ( entry->pde == NULL )
-+    {
-+        kfree( entry );
-+        return VCOS_ENOMEM;
-+    }
-+
-+    entry->name = dirName;
-+
-+    *entryp = entry;
-+    return VCOS_SUCCESS;
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_create_entry
-+*  
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_cfg_create_entry( VCOS_CFG_ENTRY_T *entryp,
-+                                     VCOS_CFG_ENTRY_T *parent,
-+                                     const char *entryName,
-+                                     VCOS_CFG_SHOW_FPTR showFunc,
-+                                     VCOS_CFG_PARSE_FPTR parseFunc,
-+                                     void *data )
-+{
-+    VCOS_CFG_ENTRY_T    entry;
-+    mode_t              mode;
-+
-+    *entryp = NULL;
-+
-+    if (( entry = kzalloc( sizeof( *entry ), GFP_KERNEL )) == NULL )
-+    {
-+        return VCOS_ENOMEM;
-+    }
-+
-+    mode = 0;
-+    if ( showFunc != NULL )
-+    {
-+        mode |= 0444;
-+    }
-+    if ( parseFunc != NULL )
-+    {
-+        mode |= 0200;
-+    }
-+    
-+    if ( parent == NULL )
-+    {
-+        entry->pde = create_proc_entry( entryName, mode, NULL );
-+    }
-+    else
-+    {
-+        entry->pde = create_proc_entry( entryName, mode, (*parent)->pde );
-+        entry->parent_pde = (*parent)->pde;
-+    }
-+    if ( entry->pde == NULL )
-+    {
-+        kfree( entry );
-+        return -ENOMEM;
-+    }
-+    entry->showFunc = showFunc;
-+    entry->parseFunc = parseFunc;
-+    entry->data = data;
-+    entry->name = entryName;
-+
-+    entry->pde->data = entry;
-+    entry->pde->proc_fops = &cfg_proc_fops;
-+    
-+    *entryp = entry;
-+    return VCOS_SUCCESS;    
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_remove_entry
-+*  
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_cfg_remove_entry( VCOS_CFG_ENTRY_T *entryp )
-+{
-+    if (( entryp != NULL ) && ( *entryp != NULL ))
-+    {
-+        remove_proc_entry( (*entryp)->name, (*entryp)->parent_pde );
-+
-+        kfree( *entryp );
-+        *entryp = NULL;
-+    }
-+
-+    return VCOS_SUCCESS;
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_is_entry_created
-+*  
-+*****************************************************************************/
-+
-+int vcos_cfg_is_entry_created( VCOS_CFG_ENTRY_T entry )
-+{
-+    return ( entry != NULL ) && ( entry->pde != NULL );
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_buf_printf
-+*  
-+*****************************************************************************/
-+
-+void vcos_cfg_buf_printf( VCOS_CFG_BUF_T buf, const char *fmt, ... )
-+{
-+    struct seq_file *m = buf->seq;
-+
-+    /* Bah - there is no seq_vprintf */
-+
-+    va_list args;
-+    int len;
-+
-+    if (m->count < m->size) {
-+        va_start(args, fmt);
-+        len = vsnprintf(m->buf + m->count, m->size - m->count, fmt, args);
-+        va_end(args);
-+        if (m->count + len < m->size) {
-+            m->count += len;
-+            return;
-+        }
-+    }
-+    m->count = m->size;
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_buf_get_str
-+*  
-+*****************************************************************************/
-+
-+char *vcos_cfg_buf_get_str( VCOS_CFG_BUF_T buf )
-+{
-+    return buf->charBuf;
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_get_proc_entry
-+*  
-+*    This function is only created for a couple of backwards compatibility '
-+*    issues and shouldn't normally be used.
-+*  
-+*****************************************************************************/
-+
-+void *vcos_cfg_get_proc_entry( VCOS_CFG_ENTRY_T entry )
-+{
-+    return entry->pde;
-+}
-+
-+/***************************************************************************** 
-+* 
-+*    vcos_cfg_get_entry_name
-+*  
-+*****************************************************************************/
-+
-+const char *vcos_cfg_get_entry_name( VCOS_CFG_ENTRY_T entry )
-+{
-+   return entry->pde->name;
-+}
-+
-+
-+EXPORT_SYMBOL( vcos_cfg_mkdir );
-+EXPORT_SYMBOL( vcos_cfg_create_entry );
-+EXPORT_SYMBOL( vcos_cfg_remove_entry );
-+EXPORT_SYMBOL( vcos_cfg_get_entry_name );
-+EXPORT_SYMBOL( vcos_cfg_is_entry_created );
-+EXPORT_SYMBOL( vcos_cfg_buf_printf );
-+EXPORT_SYMBOL( vcos_cfg_buf_get_str );
-+
-+EXPORT_SYMBOL_GPL( vcos_cfg_get_proc_entry );
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,111 @@
-+/*****************************************************************************
-+* Copyright 2009 - 2010 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+*****************************************************************************/
-+
-+#include "interface/vcos/vcos.h"
-+#include <linux/sched.h>
-+#include <linux/module.h>
-+#include <linux/freezer.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+
-+/***************************************************************************** 
-+* 
-+*        vcos_semaphore_wait_freezable
-+*  
-+*****************************************************************************/
-+
-+VCOS_STATUS_T vcos_semaphore_wait_freezable(VCOS_SEMAPHORE_T *sem)
-+{
-+    int rval, sig_pended = 0;
-+    unsigned long flags;
-+    struct task_struct *task = current;
-+
-+    while (1) {
-+       rval = down_interruptible((struct semaphore *)sem);
-+       if (rval == 0) { /* down now */
-+          break;
-+       } else {
-+          if (freezing(current)) {
-+             try_to_freeze();
-+          } else {
-+             spin_lock_irqsave(&task->sighand->siglock, flags);
-+             if (test_tsk_thread_flag(task, TIF_SIGPENDING)) {
-+                clear_tsk_thread_flag(task, TIF_SIGPENDING);
-+                sig_pended = 1;
-+             }
-+             spin_unlock_irqrestore(&task->sighand->siglock, flags);
-+          }
-+       }
-+    }
-+
-+    if (sig_pended) {
-+       spin_lock_irqsave(&task->sighand->siglock, flags);
-+       set_tsk_thread_flag(task, TIF_SIGPENDING);
-+       spin_unlock_irqrestore(&task->sighand->siglock, flags);
-+    }
-+
-+    return 0;
-+}
-+
-+EXPORT_SYMBOL( vcos_semaphore_wait_freezable );
-+
-+/***************************************************************************** 
-+* 
-+*  vcos_kmalloc
-+*  
-+*  We really need to convert malloc to do kmalloc or vmalloc based on the
-+*  size, but for now we'll add a separate function.
-+*  
-+*****************************************************************************/
-+
-+void *vcos_kmalloc(VCOS_UNSIGNED size, const char *description)
-+{
-+   (void)description;
-+
-+   return kmalloc( size, GFP_KERNEL );
-+}
-+
-+/***************************************************************************** 
-+* 
-+*  vcos_kmalloc
-+*  
-+*  We really need to convert malloc to do kmalloc or vmalloc based on the
-+*  size, but for now we'll add a separate function.
-+*  
-+*****************************************************************************/
-+
-+void *vcos_kcalloc(VCOS_UNSIGNED num, VCOS_UNSIGNED size, const char *description)
-+{
-+   (void)description;
-+
-+   return kzalloc( num * size, GFP_KERNEL );
-+}
-+
-+/***************************************************************************** 
-+* 
-+*  vcos_kfree
-+*  
-+*****************************************************************************/
-+
-+void vcos_kfree(void *ptr)
-+{
-+   kfree( ptr );
-+}
-+
-+EXPORT_SYMBOL( vcos_kmalloc );
-+EXPORT_SYMBOL( vcos_kcalloc );
-+EXPORT_SYMBOL( vcos_kfree );
-+
-+// END #########################################################################
-+// #############################################################################
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,64 @@
-+/*****************************************************************************
-+* Copyright 2006 - 2008 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). 
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+****************************************************************************/
-+
-+/* ---- Include Files ---------------------------------------------------- */
-+
-+#include "interface/vcos/vcos.h"
-+#include <linux/module.h>
-+
-+/* ---- Public Variables ------------------------------------------------- */
-+
-+/* ---- Private Constants and Types -------------------------------------- */
-+
-+/* ---- Private Variables ------------------------------------------------ */
-+
-+/* ---- Private Function Prototypes -------------------------------------- */
-+
-+/* ---- Functions -------------------------------------------------------- */
-+
-+/****************************************************************************
-+*
-+*   Called to perform module initialization when the module is loaded
-+*
-+***************************************************************************/
-+
-+static int __init vcos_mod_init( void )
-+{
-+    printk( KERN_INFO "VCOS Module\n" );
-+
-+    vcos_init();
-+    return 0;
-+}
-+
-+/****************************************************************************
-+*
-+*   Called to perform module cleanup when the module is unloaded.
-+*
-+***************************************************************************/
-+
-+static void __exit vcos_mod_exit( void )
-+{
-+    vcos_deinit();
-+}
-+
-+/****************************************************************************/
-+
-+module_init( vcos_mod_init );
-+module_exit( vcos_mod_exit );
-+
-+MODULE_AUTHOR("Broadcom");
-+MODULE_DESCRIPTION( "VCOS Module Functions" );
-+MODULE_LICENSE( "GPL" );
-+MODULE_VERSION( "1.0" );
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,507 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - Linux kernel (partial) implementation.
-+=============================================================================*/
-+
-+/* Do not include this file directly - instead include it via vcos.h */
-+
-+/** @file
-+  *
-+  * Linux kernel (partial) implementation of VCOS.
-+  *
-+  */
-+
-+#ifndef VCOS_PLATFORM_H
-+#define VCOS_PLATFORM_H
-+
-+#include <linux/types.h>
-+#include <linux/semaphore.h>
-+#include <linux/mutex.h>
-+#include <asm/bitops.h>
-+#include <linux/kthread.h>
-+#include <linux/wait.h>
-+#include <linux/vmalloc.h>
-+#include <linux/jiffies.h>
-+#include <linux/delay.h>
-+#include <linux/string.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/random.h>
-+#include <linux/sched.h>
-+#include <linux/ctype.h>
-+#include <linux/uaccess.h>
-+#include <linux/time.h>  /* for time_t */
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+
-+#define VCOS_HAVE_RTOS         1
-+#define VCOS_HAVE_SEMAPHORE    1
-+#define VCOS_HAVE_EVENT        1
-+#define VCOS_HAVE_QUEUE        0
-+#define VCOS_HAVE_LEGACY_ISR   0
-+#define VCOS_HAVE_TIMER        1
-+#define VCOS_HAVE_CANCELLATION_SAFE_TIMER 0
-+#define VCOS_HAVE_MEMPOOL      0
-+#define VCOS_HAVE_ISR          0
-+#define VCOS_HAVE_ATOMIC_FLAGS 1
-+#define VCOS_HAVE_BLOCK_POOL   0
-+#define VCOS_HAVE_ONCE         1
-+#define VCOS_HAVE_FILE         0
-+#define VCOS_HAVE_USER_BUF     0
-+#define VCOS_HAVE_CFG          1
-+#define VCOS_HAVE_SPINLOCK     0
-+#define VCOS_HAVE_CMD          1
-+#define VCOS_HAVE_EVENT_FLAGS  1
-+
-+/* Exclude many VCOS classes which don't have predicates */
-+#define VCOS_TLS_H
-+#define VCOS_NAMED_MUTEX_H
-+#define VCOS_REENTRANT_MUTEX_H
-+#define VCOS_NAMED_SEMAPHORE_H
-+#define VCOS_QUICKSLOW_MUTEX_H
-+/*#define VCOS_INIT_H */
-+/*#define VCOS_MEM_H */
-+/*#define VCOS_STRING_H */
-+
-+typedef struct semaphore      VCOS_SEMAPHORE_T;
-+typedef struct semaphore      VCOS_EVENT_T;
-+typedef struct mutex          VCOS_MUTEX_T;
-+typedef volatile int          VCOS_ONCE_T;
-+
-+typedef unsigned int          VCOS_UNSIGNED;
-+typedef unsigned int          VCOS_OPTION;
-+typedef atomic_t              VCOS_ATOMIC_FLAGS_T;
-+
-+typedef struct
-+{
-+    struct  timer_list      linux_timer;
-+    void                   *context;
-+    void                  (*expiration_routine)(void *context);
-+
-+} VCOS_TIMER_T;
-+
-+typedef struct VCOS_LLTHREAD_T
-+{
-+   struct task_struct *thread;             /**< The thread itself */
-+   VCOS_SEMAPHORE_T suspend;     /**< For support event groups and similar - a per thread semaphore */
-+} VCOS_LLTHREAD_T;
-+
-+typedef enum
-+{
-+    VCOS_O_RDONLY   = 00000000,
-+    VCOS_O_WRONLY   = 00000001,
-+    VCOS_O_RDWR     = 00000002,
-+    VCOS_O_TRUNC    = 00001000,
-+} VCOS_FILE_FLAGS_T;
-+
-+typedef struct file *VCOS_FILE_T;
-+
-+#define VCOS_SUSPEND          -1
-+#define VCOS_NO_SUSPEND       0
-+
-+#define VCOS_START 1
-+#define VCOS_NO_START 0
-+
-+#define VCOS_THREAD_PRI_MIN   -20
-+#define VCOS_THREAD_PRI_MAX   19
-+
-+#define VCOS_THREAD_PRI_INCREASE -1
-+#define VCOS_THREAD_PRI_HIGHEST  VCOS_THREAD_PRI_MIN
-+#define VCOS_THREAD_PRI_LOWEST   VCOS_THREAD_PRI_MAX
-+#define VCOS_THREAD_PRI_NORMAL ((VCOS_THREAD_PRI_MAX+VCOS_THREAD_PRI_MIN)/2)
-+#define VCOS_THREAD_PRI_ABOVE_NORMAL (VCOS_THREAD_PRI_NORMAL + VCOS_THREAD_PRI_INCREASE)
-+#define VCOS_THREAD_PRI_REALTIME VCOS_THREAD_PRI_HIGHEST
-+
-+#define _VCOS_AFFINITY_DEFAULT 0
-+#define _VCOS_AFFINITY_CPU0 0
-+#define _VCOS_AFFINITY_CPU1 0
-+#define _VCOS_AFFINITY_MASK 0
-+#define VCOS_CAN_SET_STACK_ADDR  0
-+
-+#define VCOS_TICKS_PER_SECOND HZ
-+
-+#include "interface/vcos/generic/vcos_generic_event_flags.h"
-+#include "interface/vcos/generic/vcos_mem_from_malloc.h"
-+#include "interface/vcos/generic/vcos_joinable_thread_from_plain.h"
-+
-+/***********************************************************
-+ *
-+ * Memory allcoation
-+ *
-+ ***********************************************************/
-+
-+#define  _vcos_platform_malloc   vcos_platform_malloc
-+#define  _vcos_platform_free     vcos_platform_free
-+
-+void *vcos_platform_malloc( VCOS_UNSIGNED required_size );
-+void  vcos_platform_free( void *ptr );
-+
-+#if defined(VCOS_INLINE_BODIES)
-+
-+#undef VCOS_ASSERT_LOGGING_DISABLE
-+#define VCOS_ASSERT_LOGGING_DISABLE 1
-+
-+/***********************************************************
-+ *
-+ * Counted Semaphores
-+ *
-+ ***********************************************************/
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_semaphore_wait(VCOS_SEMAPHORE_T *sem) {
-+   int ret = down_interruptible(sem);
-+   if ( ret == 0 )
-+      /* Success */
-+      return VCOS_SUCCESS;
-+   else if ( ret == -EINTR )
-+      /* Interrupted */
-+      return VCOS_EINTR;
-+   else
-+      /* Default (timeout) */
-+      return VCOS_EAGAIN;
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_semaphore_trywait(VCOS_SEMAPHORE_T *sem) {
-+   if (down_trylock(sem) != 0)
-+      return VCOS_EAGAIN;
-+   return VCOS_SUCCESS;
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_semaphore_create(VCOS_SEMAPHORE_T *sem,
-+                                    const char *name,
-+                                    VCOS_UNSIGNED initial_count) {
-+   sema_init(sem, initial_count);
-+   return VCOS_SUCCESS;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_semaphore_delete(VCOS_SEMAPHORE_T *sem) {
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_semaphore_post(VCOS_SEMAPHORE_T *sem) {
-+   up(sem);
-+   return VCOS_SUCCESS;
-+}
-+
-+/***********************************************************
-+ *
-+ * Threads
-+ *
-+ ***********************************************************/
-+
-+#include "vcos_thread_map.h"
-+
-+VCOS_INLINE_IMPL
-+VCOS_LLTHREAD_T *vcos_llthread_current(void) {
-+        return &vcos_kthread_current()->thread;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_llthread_resume(VCOS_LLTHREAD_T *thread) {
-+   vcos_assert(0);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_sleep(uint32_t ms) {
-+   msleep(ms);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_thread_set_priority(VCOS_THREAD_T *thread, VCOS_UNSIGNED p) {
-+   /* not implemented */
-+}
-+VCOS_INLINE_IMPL
-+VCOS_UNSIGNED vcos_thread_get_priority(VCOS_THREAD_T *thread) {
-+   /* not implemented */
-+   return 0;
-+}
-+
-+/***********************************************************
-+ *
-+ * Miscellaneous
-+ *
-+ ***********************************************************/
-+
-+VCOS_INLINE_IMPL
-+int vcos_strcasecmp(const char *s1, const char *s2) {
-+   return strcasecmp(s1,s2);
-+}
-+
-+
-+/***********************************************************
-+ *
-+ * Mutexes
-+ *
-+ ***********************************************************/
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_mutex_create(VCOS_MUTEX_T *m, const char *name) {
-+   mutex_init(m);
-+   return VCOS_SUCCESS;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_mutex_delete(VCOS_MUTEX_T *m) {
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_mutex_lock(VCOS_MUTEX_T *m) {
-+   int ret = mutex_lock_interruptible(m);
-+   if ( ret == 0 )
-+      /* Success */
-+      return VCOS_SUCCESS;
-+   else if ( ret == -EINTR )
-+      /* Interrupted */
-+      return VCOS_EINTR;
-+   else
-+      /* Default */
-+      return VCOS_EAGAIN;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_mutex_unlock(VCOS_MUTEX_T *m) {
-+   mutex_unlock(m);
-+}
-+
-+VCOS_INLINE_IMPL
-+int vcos_mutex_is_locked(VCOS_MUTEX_T *m) {
-+   if (mutex_trylock(m) != 0)
-+      return 1; /* it was locked */
-+   mutex_unlock(m);
-+   /* it wasn't locked */
-+   return 0;
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_mutex_trylock(VCOS_MUTEX_T *m) {
-+   if (mutex_trylock(m) == 0)
-+      return VCOS_SUCCESS;
-+   else
-+      return VCOS_EAGAIN;
-+}
-+
-+/* For supporting event groups - per thread semaphore */
-+VCOS_INLINE_IMPL
-+void _vcos_thread_sem_wait(void) {
-+   VCOS_THREAD_T *t = vcos_thread_current();
-+   vcos_semaphore_wait(&t->suspend);
-+}
-+
-+VCOS_INLINE_IMPL
-+void _vcos_thread_sem_post(VCOS_THREAD_T *target) {
-+   vcos_semaphore_post(&target->suspend);
-+}
-+
-+/***********************************************************
-+ *
-+ * Events
-+ *
-+ ***********************************************************/
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_event_create(VCOS_EVENT_T *event, const char *debug_name)
-+{
-+   sema_init(event, 0);
-+   return VCOS_SUCCESS;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_event_signal(VCOS_EVENT_T *event)
-+{
-+   up(event);
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_event_wait(VCOS_EVENT_T *event)
-+{
-+   int ret = down_interruptible(event);
-+   if ( ret == -EINTR )
-+      /* Interrupted */
-+      return VCOS_EINTR;
-+   else if (ret != 0)
-+      /* Default (timeout) */
-+      return VCOS_EAGAIN;
-+   /* Emulate a maximum count of 1 by removing any extra upness */
-+   while (down_trylock(event) == 0) continue;
-+   return VCOS_SUCCESS;
-+}
-+
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_event_try(VCOS_EVENT_T *event)
-+{
-+   return (down_trylock(event) == 0) ? VCOS_SUCCESS : VCOS_EAGAIN;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_event_delete(VCOS_EVENT_T *event)
-+{
-+}
-+
-+/***********************************************************
-+ *
-+ * Timers
-+ *
-+ ***********************************************************/
-+
-+VCOS_INLINE_DECL
-+void vcos_timer_linux_func(unsigned long data)
-+{
-+    VCOS_TIMER_T    *vcos_timer = (VCOS_TIMER_T *)data;
-+
-+    vcos_timer->expiration_routine( vcos_timer->context );
-+}
-+
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_timer_create(VCOS_TIMER_T *timer,
-+                                const char *name,
-+                                void (*expiration_routine)(void *context),
-+                                void *context) {
-+	init_timer(&timer->linux_timer);
-+	timer->linux_timer.data = (unsigned long)timer;
-+	timer->linux_timer.function = vcos_timer_linux_func;
-+
-+    timer->context = context;
-+    timer->expiration_routine = expiration_routine;
-+
-+    return VCOS_SUCCESS;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_timer_set(VCOS_TIMER_T *timer, VCOS_UNSIGNED delay_ms) {
-+	timer->linux_timer.expires = jiffies + msecs_to_jiffies(delay_ms);
-+       add_timer(&timer->linux_timer);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_timer_cancel(VCOS_TIMER_T *timer) {
-+     del_timer(&timer->linux_timer);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_timer_reset(VCOS_TIMER_T *timer, VCOS_UNSIGNED delay_ms) {
-+    del_timer_sync(&timer->linux_timer);
-+    timer->linux_timer.expires = jiffies + msecs_to_jiffies(delay_ms);
-+    add_timer(&timer->linux_timer);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_timer_delete(VCOS_TIMER_T *timer) {
-+    timer->context = NULL;
-+    timer->expiration_routine = NULL;
-+    timer->linux_timer.function = NULL;
-+    timer->linux_timer.data = 0;
-+    return;
-+}
-+
-+VCOS_INLINE_IMPL
-+VCOS_UNSIGNED vcos_process_id_current(void) {
-+   return (VCOS_UNSIGNED)current->pid;
-+}
-+
-+
-+VCOS_INLINE_IMPL
-+int vcos_in_interrupt(void) {
-+   return in_interrupt();
-+}
-+
-+/***********************************************************
-+ *
-+ * Atomic flags
-+ *
-+ ***********************************************************/
-+
-+VCOS_INLINE_IMPL
-+VCOS_STATUS_T vcos_atomic_flags_create(VCOS_ATOMIC_FLAGS_T *atomic_flags)
-+{
-+   atomic_set(atomic_flags, 0);
-+   return VCOS_SUCCESS;
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_atomic_flags_or(VCOS_ATOMIC_FLAGS_T *atomic_flags, uint32_t flags)
-+{
-+   uint32_t value;
-+   do {
-+      value = atomic_read(atomic_flags);
-+   } while (atomic_cmpxchg(atomic_flags, value, value | flags) != value);
-+}
-+
-+VCOS_INLINE_IMPL
-+uint32_t vcos_atomic_flags_get_and_clear(VCOS_ATOMIC_FLAGS_T *atomic_flags)
-+{
-+   return atomic_xchg(atomic_flags, 0);
-+}
-+
-+VCOS_INLINE_IMPL
-+void vcos_atomic_flags_delete(VCOS_ATOMIC_FLAGS_T *atomic_flags)
-+{
-+}
-+
-+#undef VCOS_ASSERT_LOGGING_DISABLE
-+#define VCOS_ASSERT_LOGGING_DISABLE 0
-+
-+#endif /* VCOS_INLINE_BODIES */
-+
-+VCOS_INLINE_DECL void _vcos_thread_sem_wait(void);
-+VCOS_INLINE_DECL void _vcos_thread_sem_post(VCOS_THREAD_T *);
-+
-+/***********************************************************
-+ *
-+ * Misc
-+ *
-+ ***********************************************************/
-+VCOS_INLINE_DECL char *vcos_strdup(const char *str);
-+
-+/***********************************************************
-+ *
-+ * Logging
-+ *
-+ ***********************************************************/
-+
-+VCOSPRE_ const char * VCOSPOST_ _vcos_log_level(void);
-+#define _VCOS_LOG_LEVEL() _vcos_log_level()
-+
-+#define  vcos_log_platform_init()               _vcos_log_platform_init()
-+#define  vcos_log_platform_register(category)   _vcos_log_platform_register(category)
-+#define  vcos_log_platform_unregister(category) _vcos_log_platform_unregister(category)
-+
-+struct VCOS_LOG_CAT_T;  /* Forward declaration since vcos_logging.h hasn't been included yet */
-+
-+void _vcos_log_platform_init(void);
-+void _vcos_log_platform_register(struct VCOS_LOG_CAT_T *category);
-+void _vcos_log_platform_unregister(struct VCOS_LOG_CAT_T *category);
-+
-+/***********************************************************
-+ *
-+ * Memory barriers
-+ *
-+ ***********************************************************/
-+
-+#define vcos_wmb(x) wmb()
-+#define vcos_rmb() rmb()
-+
-+#include "interface/vcos/generic/vcos_common.h"
-+/*#include "interface/vcos/generic/vcos_generic_quickslow_mutex.h" */
-+
-+#endif /* VCOS_PLATFORM_H */
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - platform-specific types and defines
-+=============================================================================*/
-+
-+#ifndef VCOS_PLATFORM_TYPES_H
-+#define VCOS_PLATFORM_TYPES_H
-+
-+#include <stddef.h>
-+#include <linux/types.h>
-+#include <linux/bug.h>
-+#include <linux/kernel.h>
-+
-+#define VCOSPRE_ extern
-+#define VCOSPOST_
-+
-+#if defined(__GNUC__) && (( __GNUC__ > 2 ) || (( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 3 )))
-+#define VCOS_FORMAT_ATTR_(ARCHETYPE, STRING_INDEX, FIRST_TO_CHECK)  __attribute__ ((format (ARCHETYPE, STRING_INDEX, FIRST_TO_CHECK)))
-+#else
-+#define VCOS_FORMAT_ATTR_(ARCHETYPE, STRING_INDEX, FIRST_TO_CHECK)
-+#endif
-+
-+#if !defined( __STDC_VERSION__ )
-+#define __STDC_VERSION__ 199901L
-+#endif
-+
-+#if !defined( __STDC_VERSION )
-+#define __STDC_VERSION   __STDC_VERSION__
-+#endif
-+
-+static inline void __vcos_bkpt( void ) { BUG(); }
-+#define VCOS_BKPT __vcos_bkpt()
-+
-+#define VCOS_ASSERT_MSG(...) printk( KERN_ERR "vcos_assert: " __VA_ARGS__ )
-+
-+#define PRId64 "lld"
-+#define PRIi64 "lli"
-+#define PRIo64 "llo"
-+#define PRIu64 "llu"
-+#define PRIx64 "llx"
-+
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,129 @@
-+/*****************************************************************************
-+* Copyright 2009 - 2010 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+*****************************************************************************/
-+
-+/** Support to allow VCOS thread-related functions to be called from
-+  * threads that were not created by VCOS.
-+  */
-+
-+#include <linux/semaphore.h>
-+#include <linux/vmalloc.h>
-+#include <linux/list.h>
-+#include <linux/sched.h>
-+
-+#include "vcos_thread_map.h"
-+#include "interface/vcos/vcos_logging.h"
-+
-+/*
-+ * Store the vcos_thread pointer at the end of
-+ * current kthread stack, right after the thread_info
-+ * structure.
-+ *
-+ * I belive we should be safe here to steal these 4 bytes
-+ * from the stack, as long as the vcos thread does not use up
-+ * all the stack available
-+ *
-+ * NOTE: This scheme will not work on architectures with stack growing up
-+ */
-+
-+/* Shout, if we are not being compiled for ARM kernel */
-+
-+#ifndef CONFIG_ARM
-+#error " **** The vcos kthread implementation may not work for non-ARM kernel ****"
-+#endif
-+
-+static inline void *to_current_vcos_thread(void)
-+{
-+   unsigned long *vcos_data;
-+
-+   vcos_data = (unsigned long *)((char *)current_thread_info() + sizeof(struct thread_info));
-+
-+   return (void *)vcos_data;
-+}
-+
-+
-+static inline void *to_vcos_thread(struct task_struct *tsk)
-+{
-+   unsigned long *vcos_data;
-+
-+   vcos_data = (unsigned long *)((char *)tsk->stack + sizeof(struct thread_info));
-+
-+   return (void *)vcos_data;
-+}
-+
-+/**
-+   @fn uint32_t vcos_add_thread(THREAD_MAP_T *vcos_thread);
-+*/
-+uint32_t vcos_add_thread(VCOS_THREAD_T *vcos_thread)
-+{
-+   VCOS_THREAD_T **vcos_thread_storage = (VCOS_THREAD_T **)to_current_vcos_thread();
-+
-+   *vcos_thread_storage = vcos_thread;
-+
-+   return(0);
-+}
-+
-+
-+/**
-+   @fn uint32_t vcos_remove_thread(struct task_struct * thread_id);
-+*/
-+uint32_t vcos_remove_thread(struct task_struct *thread_id)
-+{
-+   /* Remove thread_id -> VCOS_THREAD_T relationship */
-+   VCOS_THREAD_T **vcos_thread_storage;
-+
-+   /*
-+    * We want to be able to build vcos as a loadable module, which
-+    * means that we can't call get_task_struct. So we assert if we're
-+    * ever called with thread_id != current.
-+    */
-+
-+   BUG_ON( thread_id != current );
-+
-+   vcos_thread_storage = (VCOS_THREAD_T **)to_vcos_thread(thread_id);
-+
-+   *(unsigned long *)vcos_thread_storage = 0xCAFEBABE;
-+
-+   return(0);
-+}
-+
-+
-+VCOS_THREAD_T *vcos_kthread_current(void)
-+{
-+   VCOS_THREAD_T **vcos_thread_storage = (VCOS_THREAD_T **)to_current_vcos_thread();
-+
-+   /* If we find this, either the thread is already dead or stack pages of a
-+    * dead vcos thread are re-allocated to this one.
-+    *
-+    * Since there's no way to differentiate between these 2 cases, we just dump
-+    * the current task name to the log.
-+    *
-+    * If the current thread is created using VCOS API, you should *never* see this
-+    * print.
-+    * 
-+    * If its a non-VCOS thread, just let it go ...
-+    *
-+    * To debug VCOS, uncomment printk's under the "if" condition below
-+    *
-+    */
-+   if (*vcos_thread_storage == (void *)0xCAFEBABE)
-+   {
-+     #if 0
-+      printk(KERN_DEBUG"****************************************************\n");
-+      printk(KERN_DEBUG"%s : You have a problem, if \"%s\" is a VCOS thread\n",__func__, current->comm);
-+      printk(KERN_DEBUG"****************************************************\n");
-+     #endif
-+   }
-+
-+   return *vcos_thread_storage;
-+}
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,39 @@
-+/*****************************************************************************
-+* Copyright 2009 - 2010 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+*****************************************************************************/
-+
-+
-+#ifndef VCOS_THREAD_MAP_H
-+#define VCOS_THREAD_MAP_H
-+
-+#include <linux/string.h>
-+
-+#include "vcos_platform.h"
-+
-+static inline void vcos_thread_map_init(void)
-+{
-+   return;
-+}
-+
-+static inline void vcos_thread_map_cleanup(void)
-+{
-+   return;
-+}
-+
-+uint32_t vcos_add_thread(VCOS_THREAD_T *vcos_thread);
-+
-+uint32_t vcos_remove_thread(struct task_struct *thread_id);
-+
-+VCOS_THREAD_T *vcos_kthread_current(void);
-+
-+#endif /*VCOS_THREAD_MAP_H */
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,280 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - Assertion and error-handling macros.
-+=============================================================================*/
-+
-+
-+#ifndef VCOS_ASSERT_H
-+#define VCOS_ASSERT_H
-+
-+/*
-+ * Macro:
-+ *    vcos_assert(cond)
-+ *    vcos_assert_msg(cond, fmt, ...)
-+ * Use:
-+ *    Detecting programming errors by ensuring that assumptions are correct.
-+ * On failure:
-+ *    Performs a platform-dependent "breakpoint", usually with an assert-style
-+ *    message. The '_msg' variant expects a printf-style format string and
-+ *    parameters.
-+ *    If a failure is detected, the code should be fixed and rebuilt.
-+ * In release builds:
-+ *    Generates no code, i.e. does not evaluate 'cond'.
-+ * Returns:
-+ *    Nothing.
-+ *
-+ * Macro:
-+ *    vcos_demand(cond)
-+ *    vcos_demand_msg(cond, fmt, ...)
-+ * Use:
-+ *    Detecting fatal system errors that require a reboot.
-+ * On failure:
-+ *    Performs a platform-dependent "breakpoint", usually with an assert-style
-+ *    message, then calls vcos_abort (see below).
-+ * In release builds:
-+ *    Calls vcos_abort() if 'cond' is false.
-+ * Returns:
-+ *    Nothing (never, on failure).
-+ *
-+ * Macro:
-+ *    vcos_verify(cond)
-+ *    vcos_verify_msg(cond, fmt, ...)
-+ * Use:
-+ *    Detecting run-time errors and interesting conditions, normally within an
-+ *    'if' statement to catch the failures, i.e.
-+ *       if (!vcos_verify(cond)) handle_error();
-+ * On failure:
-+ *    Generates a message and optionally stops at a platform-dependent
-+ *    "breakpoint" (usually disabled). See vcos_verify_bkpts_enable below.
-+ * In release builds:
-+ *    Just evaluates and returns 'cond'.
-+ * Returns:
-+ *    Non-zero if 'cond' is true, otherwise zero.
-+ *
-+ * Macro:
-+ *    vcos_static_assert(cond)
-+ * Use:
-+ *    Detecting compile-time errors.
-+ * On failure:
-+ *    Generates a compiler error.
-+ * In release builds:
-+ *    Generates a compiler error.
-+ *
-+ * Function:
-+ *    void vcos_abort(void)
-+ * Use:
-+ *    Invokes the fatal error handling mechanism, alerting the host where
-+ *    applicable.
-+ * Returns:
-+ *    Never.
-+ *
-+ * Macro:
-+ *    VCOS_VERIFY_BKPTS
-+ * Use:
-+ *    Define in a module (before including vcos.h) to specify an alternative
-+ *    flag to control breakpoints on vcos_verify() failures.
-+ * Returns:
-+ *    Non-zero values enable breakpoints.
-+ *
-+ * Function:
-+ *    int vcos_verify_bkpts_enable(int enable);
-+ * Use:
-+ *    Sets the global flag controlling breakpoints on vcos_verify failures,
-+ *    enabling the breakpoints iff 'enable' is non-zero.
-+ * Returns:
-+ *    The previous state of the flag.
-+ *
-+ * Function:
-+ *    int vcos_verify_bkpts_enabled(void);
-+ * Use:
-+ *    Queries the state of the global flag enabling breakpoints on vcos_verify
-+ *    failures.
-+ * Returns:
-+ *    The current state of the flag.
-+ *
-+ * Examples:
-+ *
-+ * int my_breakpoint_enable_flag = 1;
-+ *
-+ * #define VCOS_VERIFY_BKPTS my_breakpoint_enable_flag
-+ *
-+ * #include "interface/vcos/vcos.h"
-+ *
-+ * vcos_static_assert((sizeof(object) % 32) == 0);
-+ *
-+ * // ...
-+ *
-+ *    vcos_assert_msg(postcondition_is_true, "Coding error");
-+ *
-+ *    if (!vcos_verify_msg(buf, "Buffer allocation failed (%d bytes)", size))
-+ *    {
-+ *       // Tidy up
-+ *       // ...
-+ *       return OUT_OF_MEMORY;
-+ *    }
-+ *
-+ *    vcos_demand(*p++==GUARDWORDHEAP);
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+
-+#ifdef __COVERITY__
-+#undef VCOS_ASSERT_BKPT
-+#define VCOS_ASSERT_BKPT __coverity_panic__()
-+#endif
-+
-+#ifndef VCOS_VERIFY_BKPTS
-+#define VCOS_VERIFY_BKPTS vcos_verify_bkpts_enabled()
-+#endif
-+
-+#ifndef VCOS_BKPT
-+#if defined(__VIDEOCORE__) && !defined(VCOS_ASSERT_NO_BKPTS)
-+#define VCOS_BKPT _bkpt()
-+#else
-+#define VCOS_BKPT (void )0
-+#endif
-+#endif
-+
-+#ifndef VCOS_ASSERT_BKPT
-+#define VCOS_ASSERT_BKPT VCOS_BKPT
-+#endif
-+
-+#ifndef VCOS_VERIFY_BKPT
-+#define VCOS_VERIFY_BKPT (VCOS_VERIFY_BKPTS ? VCOS_BKPT : (void)0)
-+#endif
-+
-+VCOSPRE_ int VCOSPOST_ vcos_verify_bkpts_enabled(void);
-+VCOSPRE_ int VCOSPOST_ vcos_verify_bkpts_enable(int enable);
-+VCOSPRE_ void VCOSPOST_ vcos_abort(void);
-+
-+#ifndef VCOS_ASSERT_MSG
-+#ifdef LOGGING
-+extern void logging_assert(const char *file, const char *func, int line, const char *format, ...);
-+#define VCOS_ASSERT_MSG(...) ((VCOS_ASSERT_LOGGING && !VCOS_ASSERT_LOGGING_DISABLE) ? logging_assert(__FILE__, __func__, __LINE__, __VA_ARGS__) : (void)0)
-+#else
-+#define VCOS_ASSERT_MSG(...) ((void)0)
-+#endif
-+#endif
-+
-+#ifndef VCOS_VERIFY_MSG
-+#define VCOS_VERIFY_MSG(...) VCOS_ASSERT_MSG(__VA_ARGS__)
-+#endif
-+
-+#ifndef VCOS_ASSERT_LOGGING
-+#define VCOS_ASSERT_LOGGING 0
-+#endif
-+
-+#ifndef VCOS_ASSERT_LOGGING_DISABLE
-+#define VCOS_ASSERT_LOGGING_DISABLE 0
-+#endif
-+
-+#if !defined(NDEBUG) || defined(VCOS_RELEASE_ASSERTS)
-+
-+#ifndef vcos_assert
-+#define vcos_assert(cond) \
-+   ( (cond) ? (void)0 : (VCOS_ASSERT_MSG("%s", #cond), VCOS_ASSERT_BKPT) )
-+#endif
-+
-+#ifndef vcos_assert_msg
-+#define vcos_assert_msg(cond, ...) \
-+   ( (cond) ? (void)0 : (VCOS_ASSERT_MSG(__VA_ARGS__), VCOS_ASSERT_BKPT) )
-+#endif
-+
-+#else  /* !defined(NDEBUG) || defined(VCOS_RELEASE_ASSERTS) */
-+
-+#ifndef vcos_assert
-+#define vcos_assert(cond) (void)0
-+#endif
-+
-+#ifndef vcos_assert_msg
-+#define vcos_assert_msg(cond, ...) (void)0
-+#endif
-+
-+#endif /* !defined(NDEBUG) || defined(VCOS_RELEASE_ASSERTS) */
-+
-+#if !defined(NDEBUG)
-+
-+#ifndef vcos_demand
-+#define vcos_demand(cond) \
-+   ( (cond) ? (void)0 : (VCOS_ASSERT_MSG("%s", #cond), VCOS_ASSERT_BKPT, vcos_abort()) )
-+#endif
-+
-+#ifndef vcos_demand_msg
-+#define vcos_demand_msg(cond, ...) \
-+   ( (cond) ? (void)0 : (VCOS_ASSERT_MSG(__VA_ARGS__), VCOS_ASSERT_BKPT, vcos_abort()) )
-+#endif
-+
-+#ifndef vcos_verify
-+#define vcos_verify(cond) \
-+   ( (cond) ? 1 : (VCOS_VERIFY_MSG("%s", #cond), VCOS_VERIFY_BKPT, 0) )
-+#endif
-+
-+#ifndef vcos_verify_msg
-+#define vcos_verify_msg(cond, ...) \
-+   ( (cond) ? 1 : (VCOS_VERIFY_MSG(__VA_ARGS__), VCOS_VERIFY_BKPT, 0) )
-+#endif
-+
-+#else  /* !defined(NDEBUG) */
-+
-+#ifndef vcos_demand
-+#define vcos_demand(cond) \
-+   ( (cond) ? (void)0 : vcos_abort() )
-+#endif
-+
-+#ifndef vcos_demand_msg
-+#define vcos_demand_msg(cond, ...) \
-+   ( (cond) ? (void)0 : vcos_abort() )
-+#endif
-+
-+#ifndef vcos_verify
-+#define vcos_verify(cond) (cond)
-+#endif
-+
-+#ifndef vcos_verify_msg
-+#define vcos_verify_msg(cond, ...) (cond)
-+#endif
-+
-+#endif /* !defined(NDEBUG) */
-+
-+#ifndef vcos_static_assert
-+#if defined(__GNUC__)
-+#define vcos_static_assert(cond) __attribute__((unused)) extern int vcos_static_assert[(cond)?1:-1]
-+#else
-+#define vcos_static_assert(cond) extern int vcos_static_assert[(cond)?1:-1]
-+#endif
-+#endif
-+
-+#ifndef vc_assert
-+#define vc_assert(cond) vcos_assert(cond)
-+#endif
-+
-+/** Print out a backtrace, on supported platforms.
-+  */
-+extern void vcos_backtrace_self(void);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* VCOS_ASSERT_H */
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,83 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file
-+=============================================================================*/
-+
-+#ifndef VCOS_ATOMIC_FLAGS_H
-+#define VCOS_ATOMIC_FLAGS_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file vcos_atomic_flags.h
-+ *
-+ * Defines atomic flags API.
-+ *
-+ * 32 flags. Atomic "or" and "get and clear" operations
-+ */
-+
-+/**
-+ * Create an atomic flags instance.
-+ *
-+ * @param atomic_flags Pointer to atomic flags instance, filled in on return
-+ *
-+ * @return VCOS_SUCCESS if succeeded.
-+ */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_atomic_flags_create(VCOS_ATOMIC_FLAGS_T *atomic_flags);
-+
-+/**
-+ * Atomically set the specified flags.
-+ *
-+ * @param atomic_flags Instance to set flags on
-+ * @param flags        Mask of flags to set
-+ */
-+VCOS_INLINE_DECL
-+void vcos_atomic_flags_or(VCOS_ATOMIC_FLAGS_T *atomic_flags, uint32_t flags);
-+
-+/**
-+ * Retrieve the current flags and then clear them. The entire operation is
-+ * atomic.
-+ *
-+ * @param atomic_flags Instance to get/clear flags from/on
-+ *
-+ * @return Mask of flags which were set (and we cleared)
-+ */
-+VCOS_INLINE_DECL
-+uint32_t vcos_atomic_flags_get_and_clear(VCOS_ATOMIC_FLAGS_T *atomic_flags);
-+
-+/**
-+ * Delete an atomic flags instance.
-+ *
-+ * @param atomic_flags Instance to delete
-+ */
-+VCOS_INLINE_DECL
-+void vcos_atomic_flags_delete(VCOS_ATOMIC_FLAGS_T *atomic_flags);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+const char *vcos_get_build_hostname( void );
-+const char *vcos_get_build_version( void );
-+const char *vcos_get_build_time( void );
-+const char *vcos_get_build_date( void );
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,113 @@
-+/*****************************************************************************
-+* Copyright 2009 - 2011 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+*****************************************************************************/
-+
-+#if !defined( VCOS_CFG_H )
-+#define VCOS_CFG_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+typedef struct opaque_vcos_cfg_buf_t    *VCOS_CFG_BUF_T;
-+typedef struct opaque_vcos_cfg_entry_t  *VCOS_CFG_ENTRY_T;
-+
-+/** \file vcos_file.h
-+  *
-+  * API for accessing configuration/statistics information. This
-+  * is loosely modelled on the linux proc entries.
-+  */
-+
-+typedef void (*VCOS_CFG_SHOW_FPTR)( VCOS_CFG_BUF_T buf, void *data );
-+typedef void (*VCOS_CFG_PARSE_FPTR)( VCOS_CFG_BUF_T buf, void *data );
-+
-+/** Create a configuration directory.
-+  *
-+  * @param entry        Place to store the created config entry.
-+  * @param parent       Parent entry (for directory like config 
-+  *                     options).
-+  * @param entryName    Name of the directory.
-+  */
-+
-+VCOS_STATUS_T vcos_cfg_mkdir( VCOS_CFG_ENTRY_T *entry,
-+                              VCOS_CFG_ENTRY_T *parent,
-+                              const char *dirName );           
-+
-+/** Create a configuration entry.
-+  *
-+  * @param entry        Place to store the created config entry.
-+  * @param parent       Parent entry (for directory like config 
-+  *                     options).
-+  * @param entryName    Name of the configuration entry.
-+  * @param showFunc     Function pointer to show configuration 
-+  *                     data.
-+  * @param parseFunc    Function pointer to parse new data. 
-+  */
-+
-+VCOS_STATUS_T vcos_cfg_create_entry( VCOS_CFG_ENTRY_T *entry,
-+                                     VCOS_CFG_ENTRY_T *parent,
-+                                     const char *entryName,
-+                                     VCOS_CFG_SHOW_FPTR showFunc,
-+                                     VCOS_CFG_PARSE_FPTR parseFunc,
-+                                     void *data );
-+
-+/** Determines if a configuration entry has been created or not.
-+  *
-+  * @param entry        Configuration entry to query.
-+  */
-+
-+int vcos_cfg_is_entry_created( VCOS_CFG_ENTRY_T entry );
-+
-+/** Returns the name of a configuration entry.
-+  *
-+  * @param entry        Configuration entry to query.
-+  */
-+
-+const char *vcos_cfg_get_entry_name( VCOS_CFG_ENTRY_T entry );
-+
-+/** Removes a configuration entry.
-+  *
-+  * @param entry        Configuration entry to remove.
-+  */
-+
-+VCOS_STATUS_T vcos_cfg_remove_entry( VCOS_CFG_ENTRY_T *entry );
-+
-+
-+/** Writes data into a configuration buffer. Only valid inside
-+  * the show function. 
-+  *
-+  * @param buf      Buffer to write data into.
-+  * @param fmt      printf style format string. 
-+  */
-+
-+void vcos_cfg_buf_printf( VCOS_CFG_BUF_T buf, const char *fmt, ... );
-+
-+/** Retrieves a null terminated string of the data associated
-+  * with the buffer. Only valid inside the parse function.
-+  *
-+  * @param buf      Buffer to get data from.
-+  * @param fmt      printf style format string. 
-+  */
-+
-+char *vcos_cfg_buf_get_str( VCOS_CFG_BUF_T buf );
-+
-+void *vcos_cfg_get_proc_entry( VCOS_CFG_ENTRY_T entry );
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,98 @@
-+/*****************************************************************************
-+* Copyright 2009 - 2011 Broadcom Corporation.  All rights reserved.
-+*
-+* Unless you and Broadcom execute a separate written software license
-+* agreement governing use of this software, this software is licensed to you
-+* under the terms of the GNU General Public License version 2, available at
-+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+*
-+* Notwithstanding the above, under no circumstances may you combine this
-+* software in any way with any other Broadcom software provided under a
-+* license other than the GPL, without Broadcom's express prior written
-+* consent.
-+*****************************************************************************/
-+
-+#if !defined( VCOS_CMD_H )
-+#define VCOS_CMD_H
-+
-+/* ---- Include Files ----------------------------------------------------- */
-+
-+#include "interface/vcos/vcos.h"
-+#include "interface/vcos/vcos_stdint.h"
-+
-+
-+/* ---- Constants and Types ---------------------------------------------- */
-+
-+struct VCOS_CMD_S;
-+typedef struct VCOS_CMD_S VCOS_CMD_T;
-+
-+typedef struct
-+{
-+    int         argc;           /* Number of arguments (includes the command/sub-command) */
-+    char      **argv;           /* Array of arguments */
-+    char      **argv_orig;      /* Original array of arguments */
-+
-+    VCOS_CMD_T *cmd_entry;
-+    VCOS_CMD_T *cmd_parent_entry;
-+
-+    int         use_log;        /* Output being logged? */
-+    size_t      result_size;    /* Size of result buffer. */
-+    char       *result_ptr;     /* Next place to put output. */
-+    char       *result_buf;     /* Start of the buffer. */
-+
-+} VCOS_CMD_PARAM_T;
-+
-+typedef VCOS_STATUS_T (*VCOS_CMD_FUNC_T)( VCOS_CMD_PARAM_T *param );
-+
-+struct VCOS_CMD_S
-+{
-+    const char         *name;
-+    const char         *args;
-+    VCOS_CMD_FUNC_T     cmd_fn;
-+    VCOS_CMD_T         *sub_cmd_entry;
-+    const char         *descr;
-+
-+};
-+
-+/* ---- Variable Externs ------------------------------------------------- */
-+
-+/* ---- Function Prototypes ---------------------------------------------- */
-+
-+/*
-+ * Common printing routine for generating command output.
-+ */
-+VCOSPRE_ void VCOSPOST_ vcos_cmd_error( VCOS_CMD_PARAM_T *param, const char *fmt, ... ) VCOS_FORMAT_ATTR_(printf, 2, 3);
-+VCOSPRE_ void VCOSPOST_ vcos_cmd_printf( VCOS_CMD_PARAM_T *param, const char *fmt, ... ) VCOS_FORMAT_ATTR_(printf, 2, 3);
-+VCOSPRE_ void VCOSPOST_ vcos_cmd_vprintf( VCOS_CMD_PARAM_T *param, const char *fmt, va_list args ) VCOS_FORMAT_ATTR_(printf, 2, 0);
-+
-+/*
-+ * Cause vcos_cmd_error, printf and vprintf to always log to the provided
-+ * category. When this call is made, the results buffer passed into
-+ * vcos_cmd_execute is used as a line buffer and does not need to be
-+ * output by the caller.
-+ */
-+VCOSPRE_ void VCOSPOST_ vcos_cmd_always_log_output( VCOS_LOG_CAT_T *log_category );
-+
-+/*
-+ * Prints command usage for the current command.
-+ */
-+VCOSPRE_ void VCOSPOST_ vcos_cmd_usage( VCOS_CMD_PARAM_T *param );
-+
-+/*
-+ * Register commands to be processed
-+ */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_cmd_register( VCOS_CMD_T *cmd_entry );
-+
-+/*
-+ * Registers multiple commands to be processed. The array should
-+ * be terminated by an entry with all zeros.
-+ */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_cmd_register_multiple( VCOS_CMD_T *cmd_entry );
-+
-+/*
-+ * Executes a command based on a command line.
-+ */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_cmd_execute( int argc, char **argv, size_t result_size, char *result_buf );
-+
-+#endif /* VCOS_CMD_H */
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,40 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file
-+=============================================================================*/
-+
-+#ifndef VCOS_CTYPE_H
-+#define VCOS_CTYPE_H
-+
-+/**
-+  * \file
-+  *
-+  * ctype functions.
-+  *
-+  */
-+
-+#ifdef __KERNEL__
-+#include <linux/ctype.h>
-+#else
-+#include <ctype.h>
-+#endif
-+
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,80 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VCOS - abstraction over dynamic library opening
-+=============================================================================*/
-+
-+#ifndef VCOS_DLFCN_H
-+#define VCOS_DLFCN_H
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define VCOS_DL_LAZY 1
-+#define VCOS_DL_NOW  2
-+
-+/**
-+ * \file
-+ *
-+ * Loading dynamic libraries. See also dlfcn.h.
-+ */
-+
-+/** Open a dynamic library.
-+  *
-+  * @param name  name of the library
-+  * @param mode  Load lazily or immediately (VCOS_DL_LAZY, VCOS_DL_NOW).
-+  *
-+  * @return A handle for use in subsequent calls.
-+  */
-+VCOSPRE_ void * VCOSPOST_ vcos_dlopen(const char *name, int mode);
-+
-+/** Look up a symbol.
-+  *
-+  * @param handle Handle to open
-+  * @param name   Name of function
-+  *
-+  * @return Function pointer, or NULL.
-+  */
-+VCOSPRE_ void VCOSPOST_ (*vcos_dlsym(void *handle, const char *name))(void);
-+
-+/** Close a library
-+  *
-+  * @param handle Handle to close
-+  */
-+VCOSPRE_ int VCOSPOST_ vcos_dlclose (void *handle);
-+
-+/** Return error message from library.
-+  *
-+  * @param err  On return, set to non-zero if an error has occurred
-+  * @param buf  Buffer to write error to
-+  * @param len  Size of buffer (including terminating NUL).
-+  */
-+VCOSPRE_ int VCOSPOST_ vcos_dlerror(int *err, char *buf, size_t buflen);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,109 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file
-+=============================================================================*/
-+
-+#ifndef VCOS_EVENT_FLAGS_H
-+#define VCOS_EVENT_FLAGS_H
-+
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+#define VCOS_EVENT_FLAGS_SUSPEND    VCOS_SUSPEND
-+#define VCOS_EVENT_FLAGS_NO_SUSPEND VCOS_NO_SUSPEND
-+typedef VCOS_OPTION VCOS_EVENTGROUP_OPERATION_T;
-+
-+/**
-+ * \file vcos_event_flags.h
-+ *
-+ * Defines event flags API.
-+ *
-+ * Similar to Nucleus event groups.
-+ *
-+ * These have the same semantics as Nucleus event groups and ThreadX event
-+ * flags. As such, they are quite complex internally; if speed is important
-+ * they might not be your best choice.
-+ *
-+ */
-+
-+/**
-+ * Create an event flags instance.
-+ *
-+ * @param flags   Pointer to event flags instance, filled in on return.
-+ * @param name    Name for the event flags, used for debug.
-+ *
-+ * @return VCOS_SUCCESS if succeeded.
-+ */
-+
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_event_flags_create(VCOS_EVENT_FLAGS_T *flags, const char *name);
-+
-+/**
-+  * Set some events.
-+  *
-+  * @param flags   Instance to set flags on
-+  * @param events  Bitmask of the flags to actually set
-+  * @param op      How the flags should be set. VCOS_OR will OR in the flags; VCOS_AND
-+  *                will AND them in, possibly clearing existing flags.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_event_flags_set(VCOS_EVENT_FLAGS_T *flags,
-+                          VCOS_UNSIGNED events,
-+                          VCOS_OPTION op);
-+
-+/**
-+ * Retrieve some events.
-+ *
-+ * Waits until the specified events have been set.
-+ *
-+ * @param flags            Instance to wait on
-+ * @param requested_events The bitmask to wait for
-+ * @param op               VCOS_OR - get any; VCOS_AND - get all.
-+ * @param ms_suspend       How long to wait, in milliseconds
-+ * @param retrieved_events the events actually retrieved.
-+ *
-+ * @return VCOS_SUCCESS if events were retrieved. VCOS_EAGAIN if the
-+ * timeout expired.
-+ */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_event_flags_get(VCOS_EVENT_FLAGS_T *flags,
-+                                                     VCOS_UNSIGNED requested_events,
-+                                                     VCOS_OPTION op,
-+                                                     VCOS_UNSIGNED ms_suspend,
-+                                                     VCOS_UNSIGNED *retrieved_events);
-+
-+
-+/**
-+ * Delete an event flags instance.
-+ */
-+VCOS_INLINE_DECL
-+void vcos_event_flags_delete(VCOS_EVENT_FLAGS_T *);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,108 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file for events
-+=============================================================================*/
-+
-+#ifndef VCOS_EVENT_H
-+#define VCOS_EVENT_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/** 
-+  * \file
-+  *
-+  * An event is akin to the Win32 auto-reset event.
-+  *
-+  *
-+  * Signalling an event will wake up one waiting thread only. Once one
-+  * thread has been woken the event atomically returns to the unsignalled
-+  * state.
-+  * 
-+  * If no threads are waiting on the event when it is signalled it remains
-+  * signalled.
-+  *
-+  * This is almost, but not quite, completely unlike the "event flags"
-+  * object based on Nucleus event groups and ThreadX event flags.
-+  *
-+  * In particular, it should be similar in speed to a semaphore, unlike
-+  * the event flags.
-+  */
-+
-+/**
-+  * Create an event instance.
-+  *
-+  * @param event  Filled in with constructed event.
-+  * @param name   Name of the event (for debugging)
-+  *
-+  * @return VCOS_SUCCESS on success, or error code.
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_event_create(VCOS_EVENT_T *event, const char *name);
-+
-+#ifndef vcos_event_signal
-+
-+/**
-+  * Signal the event. The event will return to being unsignalled
-+  * after exactly one waiting thread has been woken up. If no
-+  * threads are waiting it remains signalled.
-+  *
-+  * @param event The event to signal
-+  */
-+VCOS_INLINE_DECL
-+void vcos_event_signal(VCOS_EVENT_T *event);
-+
-+/**
-+  * Wait for the event.
-+  *
-+  * @param event The event to wait for
-+  * @return VCOS_SUCCESS on success, VCOS_EAGAIN if the wait was interrupted.
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_event_wait(VCOS_EVENT_T *event);
-+
-+/**
-+  * Try event, but don't block.
-+  *
-+  * @param event The event to try
-+  * @return VCOS_SUCCESS on success, VCOS_EAGAIN if the event is not currently signalled
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_event_try(VCOS_EVENT_T *event);
-+
-+#endif
-+
-+/*
-+ * Destroy an event.
-+ */
-+VCOS_INLINE_DECL
-+void vcos_event_delete(VCOS_EVENT_T *event);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,212 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file
-+=============================================================================*/
-+
-+/**
-+  * \mainpage OS Abstraction Layer
-+  *
-+  * \section intro Introduction
-+  *
-+  * This abstraction layer is here to allow the underlying OS to be easily changed (e.g. from
-+  * Nucleus to ThreadX) and to aid in porting host applications to new targets.
-+  *
-+  * \subsection error Error handling
-+  *
-+  * Wherever possible, VCOS functions assert internally and return void. The only exceptions
-+  * are creation functions (which might fail due to lack of resources) and functions that
-+  * might timeout or fail due to lack of space. Errors that might be reported by the underlying
-+  * OS API (e.g. invalid mutex) are treated as a programming error, and are merely asserted on.
-+  *
-+  * \section thread_synch Threads and synchronisation
-+  *
-+  * \subsection thread Threads
-+  *
-+  * The thread API is somewhat different to that found in Nucleus. In particular, threads
-+  * cannot just be destroyed at arbitrary times and nor can they merely exit. This is so
-+  * that the same API can be implemented across all interesting platforms without too much
-+  * difficulty. See vcos_thread.h for details. Thread attributes are configured via
-+  * the VCOS_THREAD_ATTR_T structure, found in vcos_thread_attr.h.
-+  *
-+  * \subsection sema Semaphores
-+  *
-+  * Counted semaphores (c.f. Nucleus NU_SEMAPHORE) are created with VCOS_SEMAPHORE_T.
-+  * Under ThreadX on VideoCore, semaphores are implemented using VideoCore spinlocks, and
-+  * so are quite a lot faster than ordinary ThreadX semaphores. See vcos_semaphore.h.
-+  *
-+  * \subsection mtx Mutexes
-+  *
-+  * Mutexes are used for locking. Attempts to take a mutex twice, or to unlock it
-+  * in a different thread to the one in which it was locked should be expected to fail.
-+  * Mutexes are not re-entrant (see vcos_reentrant_mutex.h for a slightly slower
-+  * re-entrant mutex).
-+  *
-+  * \subsection evflags Event flags
-+  *
-+  * Event flags (the ThreadX name - also known as event groups under Nucleus) provide
-+  * 32 flags which can be waited on by multiple clients, and signalled by multiple clients.
-+  * A timeout can be specified. See vcos_event_flags.h. An alternative to this is the
-+  * VCOS_EVENT_T (see vcos_event.h) which is akin to the Win32 auto-reset event, or a
-+  * saturating counted semaphore.
-+  *
-+  * \subsection event Events
-+  *
-+  * A VCOS_EVENT_T is a bit like a saturating semaphore. No matter how many times it
-+  * is signalled, the waiter will only wake up once. See vcos_event.h. You might think this
-+  * is useful if you suspect that the cost of reading the semaphore count (perhaps via a
-+  * system call) is expensive on your platform.
-+  *
-+  * \subsection tls Thread local storage
-+  *
-+  * Thread local storage is supported using vcos_tls.h. This is emulated on Nucleus
-+  * and ThreadX.
-+  *
-+  * \section int Interrupts
-+  *
-+  * The legacy LISR/HISR scheme found in Nucleus is supported via the legacy ISR API,
-+  * which is also supported on ThreadX. New code should avoid this, and old code should
-+  * be migrated away from it, since it is slow. See vcos_legacy_isr.h.
-+  *
-+  * Registering an interrupt handler, and disabling/restoring interrupts, is handled
-+  * using the functions in vcos_isr.h.
-+  *
-+  */
-+
-+/**
-+  * \file vcos.h
-+  *
-+  * This is the top level header file. Clients include this. It pulls in the platform-specific
-+  * header file (vcos_platform.h) together with header files defining the expected APIs, such
-+  * as vcos_mutex.h, vcos_semaphore.h, etc. It is also possible to include these header files
-+  * directly.
-+  *
-+  */
-+
-+#ifndef VCOS_H
-+#define VCOS_H
-+
-+#include "interface/vcos/vcos_assert.h"
-+#include "vcos_types.h"
-+#include "vcos_platform.h"
-+
-+#ifndef VCOS_INIT_H
-+#include "interface/vcos/vcos_init.h"
-+#endif
-+
-+#ifndef VCOS_SEMAPHORE_H
-+#include "interface/vcos/vcos_semaphore.h"
-+#endif
-+
-+#ifndef VCOS_THREAD_H
-+#include "interface/vcos/vcos_thread.h"
-+#endif
-+
-+#ifndef VCOS_MUTEX_H
-+#include "interface/vcos/vcos_mutex.h"
-+#endif
-+
-+#ifndef VCOS_MEM_H
-+#include "interface/vcos/vcos_mem.h"
-+#endif
-+
-+#ifndef VCOS_LOGGING_H
-+#include "interface/vcos/vcos_logging.h"
-+#endif
-+
-+#ifndef VCOS_STRING_H
-+#include "interface/vcos/vcos_string.h"
-+#endif
-+
-+#ifndef VCOS_EVENT_H
-+#include "interface/vcos/vcos_event.h"
-+#endif
-+
-+#ifndef VCOS_THREAD_ATTR_H
-+#include "interface/vcos/vcos_thread_attr.h"
-+#endif
-+
-+#ifndef VCOS_TLS_H
-+#include "interface/vcos/vcos_tls.h"
-+#endif
-+
-+#ifndef VCOS_REENTRANT_MUTEX_H
-+#include "interface/vcos/vcos_reentrant_mutex.h"
-+#endif
-+
-+#ifndef VCOS_NAMED_SEMAPHORE_H
-+#include "interface/vcos/vcos_named_semaphore.h"
-+#endif
-+
-+#ifndef VCOS_QUICKSLOW_MUTEX_H
-+#include "interface/vcos/vcos_quickslow_mutex.h"
-+#endif
-+
-+/* Headers with predicates */
-+
-+#if VCOS_HAVE_EVENT_FLAGS
-+#include "interface/vcos/vcos_event_flags.h"
-+#endif
-+
-+#if VCOS_HAVE_QUEUE
-+#include "interface/vcos/vcos_queue.h"
-+#endif
-+
-+#if VCOS_HAVE_LEGACY_ISR
-+#include "interface/vcos/vcos_legacy_isr.h"
-+#endif
-+
-+#if VCOS_HAVE_TIMER
-+#include "interface/vcos/vcos_timer.h"
-+#endif
-+
-+#if VCOS_HAVE_MEMPOOL
-+#include "interface/vcos/vcos_mempool.h"
-+#endif
-+
-+#if VCOS_HAVE_ISR
-+#include "interface/vcos/vcos_isr.h"
-+#endif
-+
-+#if VCOS_HAVE_ATOMIC_FLAGS
-+#include "interface/vcos/vcos_atomic_flags.h"
-+#endif
-+
-+#if VCOS_HAVE_ONCE
-+#include "interface/vcos/vcos_once.h"
-+#endif
-+
-+#if VCOS_HAVE_BLOCK_POOL
-+#include "interface/vcos/vcos_blockpool.h"
-+#endif
-+
-+#if VCOS_HAVE_FILE
-+#include "interface/vcos/vcos_file.h"
-+#endif
-+
-+#if VCOS_HAVE_CFG
-+#include "interface/vcos/vcos_cfg.h"
-+#endif
-+
-+#if VCOS_HAVE_CMD
-+#include "interface/vcos/vcos_cmd.h"
-+#endif
-+
-+#endif /* VCOS_H */
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,54 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - initialization routines
-+=============================================================================*/
-+
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/** \file
-+  *
-+  * Some OS support libraries need some initialization. To support this, call this
-+  * function at the start of day.
-+  */
-+
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_init(void);
-+VCOSPRE_ void VCOSPOST_ vcos_deinit(void);
-+VCOSPRE_ void VCOSPOST_ vcos_global_lock(void);
-+VCOSPRE_ void VCOSPOST_ vcos_global_unlock(void);
-+
-+/** Pass in the argv/argc arguments passed to main() */
-+VCOSPRE_ void VCOSPOST_ vcos_set_args(int argc, const char **argv);
-+
-+/** Return argc. */
-+VCOSPRE_ int VCOSPOST_ vcos_get_argc(void);
-+
-+/** Return argv. */
-+VCOSPRE_ const char ** VCOSPOST_ vcos_get_argv(void);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,290 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - logging support
-+=============================================================================*/
-+
-+#ifndef VCOS_LOGGING_H
-+#define VCOS_LOGGING_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <stdarg.h>
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file
-+ *
-+ * Logging support
-+ *
-+ * This provides categorised logging. Clients register
-+ * a category, and then get a number of logging levels for
-+ * that category.
-+ *
-+ * The logging level flag is tested using a flag *before* the
-+ * function call, which makes logging very fast when disabled - there
-+ * is no function call overhead just to find out that this log
-+ * message is disabled.
-+ *
-+ * \section VCOS_LOG_CATEGORY
-+ *
-+ * As a convenience, clients define VCOS_LOG_CATEGORY to point to
-+ * their category; the various vcos_log_xxx() macros then expand to
-+ * use this.
-+ *
-+ * e.g.
-+ *
-+ *     #define VCOS_LOG_CATEGORY (&my_category)
-+ *
-+ *     #include <interface/vcos/vcos.h>
-+ *
-+ *     VCOS_LOG_CAT_T my_category;
-+ *
-+ *     ....
-+ *
-+ *     vcos_log_trace("Stuff happened: %d", n_stuff);
-+ *
-+ */
-+
-+/** Logging levels */
-+typedef enum VCOS_LOG_LEVEL_T
-+{
-+   VCOS_LOG_UNINITIALIZED   = 0,
-+   VCOS_LOG_NEVER,
-+   VCOS_LOG_ERROR,
-+   VCOS_LOG_WARN,
-+   VCOS_LOG_INFO,
-+   VCOS_LOG_TRACE,
-+} VCOS_LOG_LEVEL_T;
-+
-+
-+/** Initialize a logging category without going through vcos_log_register().
-+ *
-+ * This is useful for the case where there is no obvious point to do the
-+ * registration (no initialization function for the module). However, it
-+ * means that your logging category is not registered, so cannot be easily
-+ * changed at run-time.
-+ */
-+#define VCOS_LOG_INIT(n,l) { l, n, 0, {0}, 0, 0 }
-+
-+/** A registered logging category.
-+  */
-+typedef struct VCOS_LOG_CAT_T
-+{
-+   VCOS_LOG_LEVEL_T level;      /** Which levels are enabled for this category */
-+   const char *name;            /** Name for this category. */
-+   struct VCOS_LOG_CAT_T *next;
-+   struct {
-+      unsigned int want_prefix:1;
-+   } flags;
-+   unsigned int refcount;
-+   void *platform_data;         /** platform specific data */
-+} VCOS_LOG_CAT_T;
-+
-+typedef void (*VCOS_VLOG_IMPL_FUNC_T)(const VCOS_LOG_CAT_T *cat, VCOS_LOG_LEVEL_T _level, const char *fmt, va_list args);
-+
-+/** Convert a VCOS_LOG_LEVEL_T into a printable string.
-+  * The platform needs to implement this function.
-+  */
-+VCOSPRE_ const char * VCOSPOST_ vcos_log_level_to_string( VCOS_LOG_LEVEL_T level );
-+
-+/** Convert a string into a VCOS_LOG_LEVEL_T
-+  * The platform needs to implement this function.
-+  */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_string_to_log_level( const char *str, VCOS_LOG_LEVEL_T *level );
-+
-+/** Log a message. Basic API. Normal code should not use this.
-+  * The platform needs to implement this function.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_log_impl(const VCOS_LOG_CAT_T *cat, VCOS_LOG_LEVEL_T _level, const char *fmt, ...) VCOS_FORMAT_ATTR_(printf, 3, 4);
-+
-+/** Log a message using a varargs parameter list. Normal code should
-+  * not use this.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_vlog_impl(const VCOS_LOG_CAT_T *cat, VCOS_LOG_LEVEL_T _level, const char *fmt, va_list args) VCOS_FORMAT_ATTR_(printf, 3, 0);
-+
-+/** Set the function which does the actual logging output.
-+ *  Passing in NULL causes the default logging function to be
-+ *  used.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_set_vlog_impl( VCOS_VLOG_IMPL_FUNC_T vlog_impl_func );
-+
-+/** The default logging function, which is provided by each
-+  * platform.
-+  */
-+
-+VCOSPRE_ void VCOSPOST_ vcos_vlog_default_impl(const VCOS_LOG_CAT_T *cat, VCOS_LOG_LEVEL_T _level, const char *fmt, va_list args) VCOS_FORMAT_ATTR_(printf, 3, 0);
-+
-+/*
-+ * Initialise the logging subsystem. This is called from
-+ * vcos_init() so you don't normally need to call it.
-+ */
-+VCOSPRE_ void VCOSPOST_ vcos_logging_init(void);
-+
-+/** Register a logging category.
-+  *
-+  * @param name the name of this category.
-+  * @param category the category to register.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_log_register(const char *name, VCOS_LOG_CAT_T *category);
-+
-+/** Unregister a logging category.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_log_unregister(VCOS_LOG_CAT_T *category);
-+
-+/** Return a default logging category, for people too lazy to create their own.
-+  *
-+  * Using the default category will be slow (there's an extra function
-+  * call overhead). Don't do this in normal code.
-+  */
-+VCOSPRE_ const VCOS_LOG_CAT_T * VCOSPOST_ vcos_log_get_default_category(void);
-+
-+VCOSPRE_ void VCOSPOST_ vcos_set_log_options(const char *opt);
-+
-+/** Set the logging level for a category at run time. Without this, the level
-+  * will be that set by vcos_log_register from a platform-specific source.
-+  *
-+  * @param category the category to modify.
-+  * @param level the new logging level for this category.
-+  */
-+VCOS_STATIC_INLINE void vcos_log_set_level(VCOS_LOG_CAT_T *category, VCOS_LOG_LEVEL_T level)
-+{
-+   category->level = level;
-+}
-+
-+#define vcos_log_dump_mem(cat,label,addr,voidMem,numBytes)  do { if (vcos_is_log_enabled(cat,VCOS_LOG_TRACE)) vcos_log_dump_mem_impl(cat,label,addr,voidMem,numBytes); } while (0)
-+
-+void vcos_log_dump_mem_impl( const VCOS_LOG_CAT_T *cat,
-+                             const char           *label,
-+                             uint32_t              addr,
-+                             const void           *voidMem,
-+                             size_t                numBytes );
-+
-+/*
-+ * Platform specific hooks (optional).
-+ */
-+#ifndef vcos_log_platform_init
-+#define vcos_log_platform_init()                (void)0
-+#endif
-+
-+#ifndef vcos_log_platform_register
-+#define vcos_log_platform_register(category)    (void)0
-+#endif
-+
-+#ifndef vcos_log_platform_unregister
-+#define vcos_log_platform_unregister(category)  (void)0
-+#endif
-+
-+/* VCOS_TRACE() - deprecated macro which just outputs in a debug build and
-+ * is a no-op in a release build.
-+ *
-+ * _VCOS_LOG_X() - internal macro which outputs if the current level for the
-+ * particular category is higher than the supplied message level.
-+ */
-+
-+#define VCOS_LOG_DFLT_CATEGORY vcos_log_get_default_category()
-+
-+#define _VCOS_LEVEL(x) (x)
-+
-+#define vcos_is_log_enabled(cat,_level)  (_VCOS_LEVEL((cat)->level) >= _VCOS_LEVEL(_level))
-+
-+#if defined(_VCOS_METAWARE) || defined(__GNUC__)
-+
-+# if !defined(NDEBUG) || defined(VCOS_ALWAYS_WANT_LOGGING)
-+#  define VCOS_LOGGING_ENABLED
-+#  define _VCOS_LOG_X(cat, _level, fmt...)   do { if (vcos_is_log_enabled(cat,_level)) vcos_log_impl(cat,_level,fmt); } while (0)
-+#  define _VCOS_VLOG_X(cat, _level, fmt, ap) do { if (vcos_is_log_enabled(cat,_level)) vcos_vlog_impl(cat,_level,fmt,ap); } while (0)
-+# else
-+#  define _VCOS_LOG_X(cat, _level, fmt...) (void)0
-+#  define _VCOS_VLOG_X(cat, _level, fmt, ap) (void)0
-+# endif
-+
-+
-+
-+# define vcos_log_error(...)   _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_ERROR, __VA_ARGS__)
-+# define vcos_log_warn(...)    _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_WARN, __VA_ARGS__)
-+# define vcos_log_info(...)    _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_INFO, __VA_ARGS__)
-+# define vcos_log_trace(...)   _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_TRACE, __VA_ARGS__)
-+
-+# define vcos_vlog_error(fmt,ap)  _VCOS_VLOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_ERROR, fmt, ap)
-+# define vcos_vlog_warn(fmt,ap)   _VCOS_VLOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_WARN, fmt, ap)
-+# define vcos_vlog_info(fmt,ap)   _VCOS_VLOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_INFO, fmt, ap)
-+# define vcos_vlog_trace(fmt,ap)  _VCOS_VLOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_TRACE, fmt, ap)
-+
-+# define vcos_log(...)   _VCOS_LOG_X(VCOS_LOG_DFLT_CATEGORY, VCOS_LOG_INFO, __VA_ARGS__)
-+# define vcos_vlog(fmt,ap)  _VCOS_VLOG_X(VCOS_LOG_DFLT_CATEGORY, VCOS_LOG_INFO, fmt, ap)
-+# define VCOS_ALERT(...) _VCOS_LOG_X(VCOS_LOG_DFLT_CATEGORY, VCOS_LOG_ERROR, __VA_ARGS__)
-+# define VCOS_TRACE(...) _VCOS_LOG_X(VCOS_LOG_DFLT_CATEGORY, VCOS_LOG_INFO, __VA_ARGS__)
-+
-+/*
-+ * MS Visual Studio - pre 2005 does not grok variadic macros
-+ */
-+#elif defined(_MSC_VER)
-+
-+# if _MSC_VER >= 1400
-+
-+#  if !defined(NDEBUG) || defined(VCOS_ALWAYS_WANT_LOGGING)
-+#   define VCOS_LOGGING_ENABLED
-+#   define _VCOS_LOG_X(cat, _level, fmt,...) do { if (vcos_is_log_enabled(cat,_level)) vcos_log_impl(cat, _level, fmt, __VA_ARGS__); } while (0)
-+#  else
-+#   define _VCOS_LOG_X(cat, _level, fmt,...) (void)0
-+#  endif
-+
-+# define vcos_log_error(fmt,...)   _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_ERROR, fmt, __VA_ARGS__)
-+# define vcos_log_warn(fmt,...)    _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_WARN, fmt, __VA_ARGS__)
-+# define vcos_log_info(fmt,...)    _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_INFO, fmt, __VA_ARGS__)
-+# define vcos_log_trace(fmt,...)   _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_TRACE, fmt, __VA_ARGS__)
-+
-+# define vcos_log(fmt,...)   _VCOS_LOG_X(VCOS_LOG_DFLT_CATEGORY, VCOS_LOG_INFO, fmt)
-+# define VCOS_ALERT(fmt,...) _VCOS_LOG_X(VCOS_LOG_DFLT_CATEGORY, VCOS_LOG_ERROR, fmt)
-+# define VCOS_TRACE(fmt,...) _VCOS_LOG_X(VCOS_LOG_DFLT_CATEGORY, VCOS_LOG_INFO, fmt)
-+
-+# else /* _MSC_VER >= 1400 */
-+
-+/* do not define these */
-+
-+# endif /* _MSC_VER >= 1400 */
-+
-+#endif
-+
-+#if VCOS_HAVE_CMD
-+
-+#include "interface/vcos/vcos_cmd.h"
-+
-+/*
-+ * These are the log sub-commands. They're exported here for user-mode apps which 
-+ * may want to call these, since the "log" command isn't registered for user-mode 
-+ * apps (vcdbg for example, has its own log command). 
-+ */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_log_assert_cmd( VCOS_CMD_PARAM_T *param );
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_log_set_cmd( VCOS_CMD_PARAM_T *param );
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_log_status_cmd( VCOS_CMD_PARAM_T *param );
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_log_test_cmd( VCOS_CMD_PARAM_T *param );
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif /* VCOS_LOGGING_H */
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,118 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - low level thread support
-+=============================================================================*/
-+
-+#ifndef VCOS_LOWLEVEL_THREAD_H
-+#define VCOS_LOWLEVEL_THREAD_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file
-+ *
-+ * This defines a low level thread API that is supported by *some* operating systems
-+ * and can be used to construct the regular "joinable thread" API on those operating
-+ * systems.
-+ *
-+ * Most clients will not need to use this code.
-+ *
-+ * \sa vcos_joinable_thread.h
-+ */
-+
-+/**
-+  * \brief Create a thread.
-+  *
-+  * This creates a thread which can be stopped either by returning from the
-+  * entry point function or by calling vcos_llthread_exit from within the entry
-+  * point function. The thread must be cleaned up by calling
-+  * vcos_llthread_delete. vcos_llthread_delete may or may not terminate the
-+  * thread.
-+  *
-+  * The preemptible parameter familiar from Nucleus is removed, as it is unused in
-+  *  VideoCore code. Affinity is added, since we do use this.
-+  *
-+  * @param thread       Filled in with thread instance
-+  * @param name         An optional name for the thread. "" may be used (but
-+  *                     a name will aid in debugging).
-+  * @param entry        Entry point
-+  * @param arg          A single argument passed to the entry point function
-+  * @param stack        Pointer to stack address
-+  * @param stacksz      Size of stack in bytes
-+  * @param priority     Priority of task, between VCOS_PRI_LOW and VCOS_PRI_HIGH
-+  * @param affinity     CPU affinity
-+  *
-+  * @sa vcos_llthread_terminate vcos_llthread_delete
-+  */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_llthread_create(VCOS_LLTHREAD_T *thread,
-+                                                      const char *name,
-+                                                      VCOS_LLTHREAD_ENTRY_FN_T entry,
-+                                                      void *arg,
-+                                                      void *stack,
-+                                                      VCOS_UNSIGNED stacksz,
-+                                                      VCOS_UNSIGNED priority,
-+                                                      VCOS_UNSIGNED affinity,
-+                                                      VCOS_UNSIGNED timeslice,
-+                                                      VCOS_UNSIGNED autostart);
-+
-+/**
-+  * \brief Exits the current thread.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_llthread_exit(void);
-+
-+/**
-+  * \brief Delete a thread. This must be called to cleanup after
-+  * vcos_llthread_create. This may or may not terminate the thread.
-+  * It does not clean up any resources that may have been
-+  * allocated by the thread.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_llthread_delete(VCOS_LLTHREAD_T *thread);
-+
-+/**
-+  * \brief Return current lowlevel thread pointer.
-+  */
-+VCOS_INLINE_DECL
-+VCOS_LLTHREAD_T *vcos_llthread_current(void);
-+
-+/**
-+  * Resume a thread.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_llthread_resume(VCOS_LLTHREAD_T *thread);
-+
-+VCOSPRE_ int VCOSPOST_ vcos_llthread_running(VCOS_LLTHREAD_T *thread);
-+
-+/**
-+  * \brief Create a VCOS_LLTHREAD_T for the current thread. This is so we can
-+  * have VCOS_LLTHREAD_Ts even for threads not originally created by VCOS (eg
-+  * the thread that calls vcos_init).
-+  */
-+extern VCOS_STATUS_T _vcos_llthread_create_attach(VCOS_LLTHREAD_T *thread);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,92 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - memory support
-+=============================================================================*/
-+
-+#ifndef VCOS_MEM_H
-+#define VCOS_MEM_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/** \file
-+  *
-+  * Memory allocation api (malloc/free equivalents) is for benefit of host
-+  * applications. VideoCore code should use rtos_XXX functions.
-+  *
-+  */
-+
-+
-+/** Allocate memory
-+  *
-+  * @param size Size of memory to allocate
-+  * @param description Description, to aid in debugging. May be ignored internally on some platforms.
-+  */
-+VCOS_INLINE_DECL
-+void *vcos_malloc(VCOS_UNSIGNED size, const char *description);
-+
-+void *vcos_kmalloc(VCOS_UNSIGNED size, const char *description);
-+void *vcos_kcalloc(VCOS_UNSIGNED num, VCOS_UNSIGNED size, const char *description);
-+
-+/** Allocate cleared memory
-+  *
-+  * @param num Number of items to allocate.
-+  * @param size Size of each item in bytes.
-+  * @param description Description, to aid in debugging. May be ignored internally on some platforms.
-+  */
-+VCOS_INLINE_DECL
-+void *vcos_calloc(VCOS_UNSIGNED num, VCOS_UNSIGNED size, const char *description);
-+
-+/** Free memory
-+  *
-+  * Free memory that has been allocated.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_free(void *ptr);
-+
-+void vcos_kfree(void *ptr);
-+
-+/** Allocate aligned memory
-+  *
-+  * Allocate memory aligned on the specified boundary.
-+  *
-+  * @param size Size of memory to allocate
-+  * @param description Description, to aid in debugging. May be ignored internally on some platforms.
-+  */
-+VCOS_INLINE_DECL
-+void *vcos_malloc_aligned(VCOS_UNSIGNED size, VCOS_UNSIGNED align, const char *description);
-+
-+/** Return the amount of free heap memory
-+  *
-+  */
-+VCOS_INLINE_DECL
-+unsigned long vcos_get_free_mem(void);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,168 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VCOS - packet-like messages, based loosely on those found in TRIPOS.
-+=============================================================================*/
-+
-+#ifndef VCOS_MSGQUEUE_H
-+#define VCOS_MSGQUEUE_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file
-+ *
-+ * Packet-like messages, based loosely on those found in TRIPOS and
-+ * derivatives thereof.
-+ *
-+ * A task can send a message *pointer* to another task, where it is
-+ * queued on a linked list and the task woken up. The receiving task
-+ * consumes all of the messages on its input queue, and optionally
-+ * sends back replies using the original message memory.
-+ *
-+ * A caller can wait for the reply to a specific message - any other
-+ * messages that arrive in the meantime are queued separately.
-+ *
-+ *
-+ * All messages have a standard common layout, but the payload area can
-+ * be used freely to extend this.
-+ */
-+
-+/** Map the payload portion of a message to a structure pointer.
-+  */
-+#define VCOS_MSG_DATA(_msg) (void*)((_msg)->data)
-+
-+/** Standard message ids - FIXME - these need to be done properly! */
-+#define VCOS_MSG_N_QUIT            1
-+#define VCOS_MSG_N_OPEN            2
-+#define VCOS_MSG_N_CLOSE           3
-+#define VCOS_MSG_N_PRIVATE         (1<<20)
-+
-+#define VCOS_MSG_REPLY_BIT         (1<<31)
-+
-+/** Make gnuc compiler be happy about pointer punning */
-+#ifdef __GNUC__
-+#define __VCOS_MAY_ALIAS __attribute__((__may_alias__))
-+#else
-+#define __VCOS_MAY_ALIAS
-+#endif
-+
-+/** A single message queue.
-+  */
-+typedef struct VCOS_MSGQUEUE_T
-+{
-+   struct VCOS_MSG_T *head;            /**< head of linked list of messages waiting on this queue */
-+   struct VCOS_MSG_T *tail;            /**< tail of message queue */
-+   VCOS_SEMAPHORE_T sem;               /**< thread waits on this for new messages */
-+   VCOS_MUTEX_T lock;                  /**< locks the messages list */
-+} VCOS_MSGQUEUE_T;
-+
-+/** A single message
-+  */
-+typedef struct VCOS_MSG_T
-+{
-+   uint32_t code;                      /**< message code */
-+   int error;                          /**< error status signalled back to caller */
-+   VCOS_MSGQUEUE_T *dst;               /**< destination queue */
-+   VCOS_MSGQUEUE_T *src;               /**< source; replies go back to here */
-+   struct VCOS_MSG_T *next;            /**< next in queue */
-+   VCOS_THREAD_T *src_thread;          /**< for debug */
-+   uint32_t data[25];                  /**< payload area */
-+} VCOS_MSG_T;
-+   
-+/** An endpoint
-+  */
-+typedef struct VCOS_MSG_ENDPOINT_T
-+{
-+   VCOS_MSGQUEUE_T primary;            /**< incoming messages */
-+   VCOS_MSGQUEUE_T secondary;          /**< this is used for waitspecific */
-+   char name[32];                      /**< name of this endpoint, for find() */
-+   struct VCOS_MSG_ENDPOINT_T *next;   /**< next in global list of endpoints */
-+} VCOS_MSG_ENDPOINT_T;
-+#define MSG_REPLY_BIT (1<<31)
-+
-+/** Initalise the library. Normally called from vcos_init().
-+  */
-+extern VCOS_STATUS_T vcos_msgq_init(void);
-+
-+/** Find a message queue by name and get a handle to it.
-+  *
-+  * @param name  the name of the queue to find
-+  *
-+  * @return The message queue, or NULL if not found.
-+  */
-+VCOSPRE_ VCOS_MSGQUEUE_T VCOSPOST_ *vcos_msgq_find(const char *name);
-+
-+/** Wait for a message queue to come into existence. If it already exists,
-+  * return immediately, otherwise block.
-+  *
-+  * On the whole, if you find yourself using this, it is probably a sign
-+  * of poor design, since you should create all the server threads first,
-+  * and then the client threads. But it is sometimes useful.
-+  *
-+  * @param name  the name of the queue to find
-+  * @return The message queue
-+  */
-+VCOSPRE_ VCOS_MSGQUEUE_T VCOSPOST_ *vcos_msgq_wait(const char *name);
-+
-+/** Send a message.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_msg_send(VCOS_MSGQUEUE_T *dest, uint32_t code, VCOS_MSG_T *msg);
-+
-+/** Send a message and wait for a reply.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_msg_sendwait(VCOS_MSGQUEUE_T *queue, uint32_t code, VCOS_MSG_T *msg);
-+
-+/** Wait for a message on this thread's endpoint.
-+  */
-+VCOSPRE_ VCOS_MSG_T * VCOSPOST_ vcos_msg_wait(void);
-+
-+/** Wait for a specific message.
-+  */
-+VCOS_MSG_T * vcos_msg_wait_specific(VCOS_MSGQUEUE_T *queue, VCOS_MSG_T *msg);
-+
-+/** Peek for a message on this thread's endpoint, if a message is not available, NULL is 
-+    returned. If a message is available it will be removed from the endpoint and returned.
-+  */
-+VCOSPRE_ VCOS_MSG_T * VCOSPOST_ vcos_msg_peek(void);
-+
-+/** Send a reply to a message
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_msg_reply(VCOS_MSG_T *msg);
-+
-+/** Create an endpoint. Each thread should need no more than one of these - if you 
-+  * find yourself needing a second one, you've done something wrong.
-+  */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_msgq_endpoint_create(VCOS_MSG_ENDPOINT_T *ep, const char *name);
-+
-+/** Destroy an endpoint.
-+  */
-+VCOSPRE_ void  VCOSPOST_ vcos_msgq_endpoint_delete(VCOS_MSG_ENDPOINT_T *ep);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,103 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - mutex public header file
-+=============================================================================*/
-+
-+#ifndef VCOS_MUTEX_H
-+#define VCOS_MUTEX_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file vcos_mutex.h
-+ *
-+ * Mutex API. Mutexes are not re-entrant, as supporting this adds extra code
-+ * that slows down clients which have been written sensibly.
-+ *
-+ * \sa vcos_reentrant_mutex.h
-+ *
-+ */
-+
-+/** Create a mutex.
-+  *
-+  * @param m      Filled in with mutex on return
-+  * @param name   A non-null name for the mutex, used for diagnostics.
-+  *
-+  * @return VCOS_SUCCESS if mutex was created, or error code.
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_mutex_create(VCOS_MUTEX_T *m, const char *name);
-+
-+/** Delete the mutex.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_mutex_delete(VCOS_MUTEX_T *m);
-+
-+/**
-+  * \brief Wait to claim the mutex.
-+  *
-+  * On most platforms this always returns VCOS_SUCCESS, and so would ideally be
-+  * a void function, however some platforms allow a wait to be interrupted so
-+  * it remains non-void.
-+  *
-+  * Try to obtain the mutex.
-+  * @param m   Mutex to wait on
-+  * @return VCOS_SUCCESS - mutex was taken.
-+  *         VCOS_EAGAIN  - could not take mutex.
-+  */
-+#ifndef vcos_mutex_lock
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_mutex_lock(VCOS_MUTEX_T *m);
-+
-+/** Release the mutex.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_mutex_unlock(VCOS_MUTEX_T *m);
-+#endif
-+
-+/** Test if the mutex is already locked.
-+  *
-+  * @return 1 if mutex is locked, 0 if it is unlocked.
-+  */
-+VCOS_INLINE_DECL
-+int vcos_mutex_is_locked(VCOS_MUTEX_T *m);
-+
-+/** Obtain the mutex if possible.
-+  *
-+  * @param m  the mutex to try to obtain
-+  *
-+  * @return VCOS_SUCCESS if mutex is succesfully obtained, or VCOS_EAGAIN
-+  * if it is already in use by another thread.
-+  */
-+#ifndef vcos_mutex_trylock
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_mutex_trylock(VCOS_MUTEX_T *m);
-+#endif
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,53 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - 'once'
-+=============================================================================*/
-+
-+#ifndef VCOS_ONCE_H
-+#define VCOS_ONCE_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file vcos_once.h
-+ *
-+ * Ensure something is called only once.
-+ *
-+ * Initialize once_control to VCOS_ONCE_INIT. The first
-+ * time this is called, the init_routine will be called. Thereafter
-+ * it won't.
-+ *
-+ * \sa pthread_once()
-+ *
-+ */
-+
-+VCOS_STATUS_T vcos_once(VCOS_ONCE_T *once_control,
-+                        void (*init_routine)(void));
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,126 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file
-+=============================================================================*/
-+
-+#ifndef VCOS_SEMAPHORE_H
-+#define VCOS_SEMAPHORE_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file vcos_semaphore.h
-+ *
-+ * \section sem Semaphores
-+ *
-+ * This provides counting semaphores. Semaphores are not re-entrant. On sensible
-+ * operating systems a semaphore can always be posted but can only be taken in 
-+ * thread (not interrupt) context. Under Nucleus, a LISR cannot post a semaphore,
-+ * although it would not be hard to lift this restriction.
-+ *
-+ * \subsection timeout Timeout
-+ *
-+ * On both Nucleus and ThreadX a semaphore can be taken with a timeout. This is
-+ * not supported by VCOS because it makes the non-timeout code considerably more
-+ * complicated (and hence slower). In the unlikely event that you need a timeout
-+ * with a semaphore, and you cannot simply redesign your code to avoid it, use
-+ * an event flag (vcos_event_flags.h).
-+ *
-+ * \subsection sem_nucleus Changes from Nucleus:
-+ *
-+ *  Semaphores are always "FIFO" - i.e. sleeping threads are woken in FIFO order. That's
-+ *  because:
-+ *  \arg there's no support for NU_PRIORITY in threadx (though it can be emulated, slowly)
-+ *  \arg we don't appear to actually consciously use it - for example, Dispmanx uses
-+ *  it, but all threads waiting are the same priority.
-+ *         
-+ */
-+
-+/** 
-+  * \brief Create a semaphore.
-+  *
-+  * Create a semaphore.
-+  *
-+  * @param sem   Pointer to memory to be initialized
-+  * @param name  A name for this semaphore. The name may be truncated internally.
-+  * @param count The initial count for the semaphore.
-+  *
-+  * @return VCOS_SUCCESS if the semaphore was created.
-+  * 
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_semaphore_create(VCOS_SEMAPHORE_T *sem, const char *name, VCOS_UNSIGNED count);
-+
-+/**
-+  * \brief Wait on a semaphore.
-+  *
-+  * There is no timeout option on a semaphore, as adding this will slow down
-+  * implementations on some platforms. If you need that kind of behaviour, use
-+  * an event group.
-+  *
-+  * On most platforms this always returns VCOS_SUCCESS, and so would ideally be
-+  * a void function, however some platforms allow a wait to be interrupted so
-+  * it remains non-void.
-+  *
-+  * @param sem Semaphore to wait on
-+  * @return VCOS_SUCCESS - semaphore was taken.
-+  *         VCOS_EAGAIN  - could not take semaphore
-+  *
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_semaphore_wait(VCOS_SEMAPHORE_T *sem);
-+
-+/**
-+  * \brief Try to wait for a semaphore.
-+  *
-+  * Try to obtain the semaphore. If it is already taken, return VCOS_TIMEOUT.
-+  * @param sem Semaphore to wait on
-+  * @return VCOS_SUCCESS - semaphore was taken.
-+  *         VCOS_EAGAIN - could not take semaphore
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_semaphore_trywait(VCOS_SEMAPHORE_T *sem);
-+
-+/**
-+  * \brief Post a semaphore.
-+  *
-+  * @param sem Semaphore to wait on
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_semaphore_post(VCOS_SEMAPHORE_T *sem);
-+
-+/**
-+  * \brief Delete a semaphore, releasing any resources consumed by it.
-+  *
-+  * @param sem Semaphore to wait on
-+  */
-+VCOS_INLINE_DECL
-+void vcos_semaphore_delete(VCOS_SEMAPHORE_T *sem);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,34 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+#ifndef VCOS_STDBOOL_H
-+#define VCOS_STDBOOL_H
-+
-+#ifndef __cplusplus
-+
-+#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L)
-+#include <stdbool.h>
-+#else
-+typedef enum {
-+   false,
-+   true
-+} bool;
-+#endif
-+
-+#endif /* __cplusplus */
-+
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,203 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef VCOS_STDINT_H
-+#define VCOS_STDINT_H
-+
-+/* Attempt to provide the types defined in stdint.h.
-+ *
-+ * Ideally this would either call out to a platform-specific
-+ * header file (e.g. stdint.h) or define the types on a
-+ * per-architecture/compiler basis. But for now we just
-+ * use #ifdefs.
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifdef __SYMBIAN32__
-+
-+typedef signed   char      int8_t;
-+typedef unsigned char      uint8_t;
-+
-+typedef signed   short     int16_t;
-+typedef unsigned short     uint16_t;
-+
-+typedef int16_t            int_least16_t;
-+
-+typedef signed   long      int32_t;
-+typedef unsigned long      uint32_t;
-+
-+typedef signed long long   int64_t;
-+typedef unsigned long long uint64_t;
-+
-+typedef int32_t            intptr_t;
-+typedef uint32_t           uintptr_t;
-+
-+typedef int64_t            intmax_t;
-+typedef uint64_t           uintmax_t;
-+
-+#define INT8_MIN SCHAR_MIN
-+#define INT8_MAX SCHAR_MAX
-+#define UINT8_MAX UCHAR_MAX
-+#define INT16_MIN SHRT_MIN
-+#define INT16_MAX SHRT_MAX
-+#define UINT16_MAX USHRT_MAX
-+#define INT32_MIN LONG_MIN
-+#define INT32_MAX LONG_MAX
-+#define UINT32_MAX ULONG_MAX
-+#define INT64_MIN LLONG_MIN
-+#define INT64_MAX LLONG_MAX
-+#define UINT64_MAX ULLONG_MAX
-+
-+#define INTPTR_MIN INT32_MIN
-+#define INTPTR_MAX INT32_MAX
-+#define UINTPTR_MAX UINT32_MAX
-+#define INTMAX_MIN INT64_MIN
-+#define INTMAX_MAX INT64_MAX
-+#define INT_LEAST16_MAX INT16_MAX
-+#define INT_LEAST16_MAX INT16_MAX
-+
-+/*{{{ C99 types  - THIS WHOLE SECTION IS INCOMPATIBLE WITH C99. IT SHOULD RESIDE IN A STDINT.H SINCE THIS FILE GETS USED ON HOST SIDE */
-+
-+#elif defined( __STDC__ ) && __STDC_VERSION__ >= 199901L
-+
-+#include <stdint.h>
-+
-+#elif defined( __GNUC__ )
-+
-+#include <stdint.h>
-+
-+#elif defined(_MSC_VER)                     /* Visual C define equivalent types */
-+
-+#include <stddef.h> /* Avoids intptr_t being defined in vadefs.h */
-+
-+typedef          __int8    int8_t;
-+typedef unsigned __int8    uint8_t;
-+
-+typedef          __int16   int16_t;
-+typedef unsigned __int16   uint16_t;
-+
-+typedef          __int32   int32_t;
-+typedef unsigned __int32   uint32_t;
-+
-+typedef          __int64   int64_t;
-+typedef unsigned __int64   uint64_t;
-+typedef uint32_t           uintptr_t;
-+typedef int64_t            intmax_t;
-+typedef uint64_t           uintmax_t;
-+typedef int16_t            int_least16_t;
-+
-+#elif defined (VCMODS_LCC)
-+#include <limits.h>
-+
-+typedef signed   char      int8_t;
-+typedef unsigned char      uint8_t;
-+
-+typedef signed   short     int16_t;
-+typedef unsigned short     uint16_t;
-+
-+typedef signed   long      int32_t;
-+typedef unsigned long      uint32_t;
-+
-+typedef signed   long      int64_t; /*!!!! PFCD, this means code using 64bit numbers will be broken on the VCE */
-+typedef unsigned long      uint64_t; /* !!!! PFCD */
-+
-+typedef int32_t            intptr_t;
-+typedef uint32_t           uintptr_t;
-+typedef int64_t            intmax_t;
-+typedef uint64_t           uintmax_t;
-+typedef int16_t            int_least16_t;
-+
-+#define INT8_MIN SCHAR_MIN
-+#define INT8_MAX SCHAR_MAX
-+#define UINT8_MAX UCHAR_MAX
-+#define INT16_MIN SHRT_MIN
-+#define INT16_MAX SHRT_MAX
-+#define UINT16_MAX USHRT_MAX
-+#define INT32_MIN LONG_MIN
-+#define INT32_MAX LONG_MAX
-+#define UINT32_MAX ULONG_MAX
-+#define INT64_MIN LONG_MIN /* !!!! PFCD */
-+#define INT64_MAX LONG_MAX /* !!!! PFCD */
-+#define UINT64_MAX ULONG_MAX /* !!!! PFCD */
-+
-+#define INTPTR_MIN INT32_MIN
-+#define INTPTR_MAX INT32_MAX
-+#define UINTPTR_MAX UINT32_MAX
-+#define INTMAX_MIN INT64_MIN
-+#define INTMAX_MIN INT64_MIN
-+#define INT_LEAST16_MAX INT16_MAX
-+#define INT_LEAST16_MAX INT16_MAX
-+
-+#elif defined(__VIDEOCORE__)
-+
-+typedef signed   char      int8_t;
-+typedef unsigned char      uint8_t;
-+
-+typedef signed   short     int16_t;
-+typedef unsigned short     uint16_t;
-+
-+typedef signed   long      int32_t;
-+typedef unsigned long      uint32_t;
-+
-+typedef signed   long long int64_t;
-+typedef unsigned long long uint64_t;
-+
-+typedef int32_t            intptr_t;
-+typedef uint32_t           uintptr_t;
-+typedef int64_t            intmax_t;
-+typedef uint64_t           uintmax_t;
-+typedef int16_t            int_least16_t;
-+
-+#define INT8_MIN SCHAR_MIN
-+#define INT8_MAX SCHAR_MAX
-+#define UINT8_MAX UCHAR_MAX
-+#define INT16_MIN SHRT_MIN
-+#define INT16_MAX SHRT_MAX
-+#define UINT16_MAX USHRT_MAX
-+#define INT32_MIN LONG_MIN
-+#define INT32_MAX LONG_MAX
-+#define UINT32_MAX ULONG_MAX
-+#define INT64_MIN LLONG_MIN
-+#define INT64_MAX LLONG_MAX
-+#define UINT64_MAX ULLONG_MAX
-+
-+#define INTPTR_MIN INT32_MIN
-+#define INTPTR_MAX INT32_MAX
-+#define UINTPTR_MAX UINT32_MAX
-+#define INTMAX_MIN INT64_MIN
-+#define INTMAX_MAX INT64_MAX
-+#define INT_LEAST16_MAX INT16_MAX
-+#define INT_LEAST16_MAX INT16_MAX
-+
-+#elif defined (__HIGHC__) && defined(_I386)
-+
-+#include <stdint.h>
-+
-+#else
-+#error Unknown platform
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif /* VCOS_STDINT_H */
-+
-+
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file
-+=============================================================================*/
-+
-+#ifndef VCOS_STRING_H
-+#define VCOS_STRING_H
-+
-+/**
-+  * \file
-+  *
-+  * String functions.
-+  *
-+  */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+#ifdef __KERNEL__
-+#include <linux/string.h>
-+#else
-+#include <string.h>
-+#endif
-+
-+/** Case insensitive string comparison.
-+  *
-+  */
-+
-+VCOS_INLINE_DECL
-+int vcos_strcasecmp(const char *s1, const char *s2);
-+
-+VCOS_INLINE_DECL
-+int vcos_strncasecmp(const char *s1, const char *s2, size_t n);
-+
-+VCOSPRE_ int VCOSPOST_ vcos_vsnprintf( char *buf, size_t buflen, const char *fmt, va_list ap );
-+
-+VCOSPRE_ int VCOSPOST_ vcos_snprintf(char *buf, size_t buflen, const char *fmt, ...);
-+
-+VCOS_STATIC_INLINE
-+int vcos_strlen(const char *s) { return (int)strlen(s); }
-+
-+VCOS_STATIC_INLINE
-+int vcos_strcmp(const char *s1, const char *s2) { return strcmp(s1,s2); }
-+
-+VCOS_STATIC_INLINE
-+int vcos_strncmp(const char *cs, const char *ct, size_t count) { return strncmp(cs, ct, count); }
-+
-+VCOS_STATIC_INLINE
-+char *vcos_strcpy(char *dst, const char *src) { return strcpy(dst, src); }
-+
-+VCOS_STATIC_INLINE
-+char *vcos_strncpy(char *dst, const char *src, size_t count) { return strncpy(dst, src, count); }
-+
-+VCOS_STATIC_INLINE
-+void *vcos_memcpy(void *dst, const void *src, size_t n) {  memcpy(dst, src, n);  return dst;  }
-+
-+VCOS_STATIC_INLINE
-+void *vcos_memset(void *p, int c, size_t n) { return memset(p, c, n); }
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,87 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - thread attributes
-+=============================================================================*/
-+
-+#ifndef VCOS_THREAD_ATTR_H
-+#define VCOS_THREAD_ATTR_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/**
-+ * \file
-+ *
-+ * Attributes for thread creation.
-+ *
-+ */
-+
-+/** Initialize thread attribute struct. This call does not allocate memory,
-+  * and so cannot fail.
-+  *
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_thread_attr_init(VCOS_THREAD_ATTR_T *attrs);
-+
-+/** Set the stack address and size. If not set, a stack will be allocated automatically.
-+  *
-+  * This can only be set on some platforms. It will always be possible to set the stack
-+  * address on VideoCore, but on host platforms, support may well not be available.
-+  */
-+#if VCOS_CAN_SET_STACK_ADDR
-+VCOS_INLINE_DECL
-+void vcos_thread_attr_setstack(VCOS_THREAD_ATTR_T *attrs, void *addr, VCOS_UNSIGNED sz);
-+#endif
-+
-+/** Set the stack size. If not set, a default size will be used. Attempting to call this after having
-+  * set the stack location with vcos_thread_attr_setstack() will result in undefined behaviour.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_thread_attr_setstacksize(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED sz);
-+
-+/** Set the task priority. If not set, a default value will be used.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_thread_attr_setpriority(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED pri);
-+
-+/** Set the task cpu affinity. If not set, the default will be used.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_thread_attr_setaffinity(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED aff);
-+
-+/** Set the timeslice. If not set the default will be used.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_thread_attr_settimeslice(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED ts);
-+
-+/** The thread entry function takes (argc,argv), as per Nucleus, with
-+  * argc being 0. This may be withdrawn in a future release and should not
-+  * be used in new code.
-+  */
-+VCOS_INLINE_DECL
-+void _vcos_thread_attr_setlegacyapi(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED legacy);
-+
-+VCOS_INLINE_DECL
-+void vcos_thread_attr_setautostart(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED autostart);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,270 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - public header file
-+=============================================================================*/
-+
-+#ifndef VCOS_THREAD_H
-+#define VCOS_THREAD_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/**
-+ * \file vcos_thread.h
-+ *
-+ * \section thread Threads
-+ *
-+ * Under Nucleus, a thread is created by NU_Create_Task, passing in the stack
-+ * and various other parameters. To stop the thread, NU_Terminate_Thread() and
-+ * NU_Delete_Thread() are called.
-+ *
-+ * Unfortunately it's not possible to emulate this API under some fairly common
-+ * operating systems. Under Windows you can't pass in the stack, and you can't
-+ * safely terminate a thread.
-+ *
-+ * Therefore, an API which is similar to the pthreads API is used instead. This
-+ * API can (mostly) be emulated under all interesting operating systems.
-+ *
-+ * Obviously this makes the code somewhat more complicated on VideoCore than it
-+ * would otherwise be - we end up with an extra mutex per thread, and some code
-+ * that waits for it. The benefit is that we have a single way of creating
-+ * threads that works consistently on all platforms (apart from stack supplying).
-+ *
-+ * \subsection stack Stack
-+ *
-+ * It's still not possible to pass in the stack address, but this can be made
-+ * much more obvious in the API: the relevant function is missing and the
-+ * CPP symbol VCOS_CAN_SET_STACK_ADDR is zero rather than one.
-+ *
-+ * \subsection thr_create Creating a thread
-+ *
-+ * The simplest way to create a thread is with vcos_thread_create() passing in a
-+ * NULL thread parameter argument. To wait for the thread to exit, call
-+ * vcos_thread_join().
-+ *
-+ * \subsection back Backward compatibility
-+ *
-+ * To ease migration, a "classic" thread creation API is provided for code
-+ * that used to make use of Nucleus, vcos_thread_create_classic(). The
-+ * arguments are not exactly the same, as the PREEMPT parameter is dropped.
-+ *
-+ */
-+
-+#define VCOS_AFFINITY_CPU0    _VCOS_AFFINITY_CPU0
-+#define VCOS_AFFINITY_CPU1    _VCOS_AFFINITY_CPU1
-+#define VCOS_AFFINITY_MASK    _VCOS_AFFINITY_MASK
-+#define VCOS_AFFINITY_DEFAULT _VCOS_AFFINITY_DEFAULT
-+#define VCOS_AFFINITY_THISCPU _VCOS_AFFINITY_THISCPU
-+
-+/** Report whether or not we have an RTOS at all, and hence the ability to
-+  * create threads.
-+  */
-+VCOSPRE_ int VCOSPOST_ vcos_have_rtos(void);
-+
-+/** Create a thread. It must be cleaned up by calling vcos_thread_join().
-+  *
-+  * @param thread   Filled in on return with thread
-+  * @param name     A name for the thread. May be the empty string.
-+  * @param attrs    Attributes; default attributes will be used if this is NULL.
-+  * @param entry    Entry point.
-+  * @param arg      Argument passed to the entry point.
-+  */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_thread_create(VCOS_THREAD_T *thread,
-+                                                    const char *name,
-+                                                    VCOS_THREAD_ATTR_T *attrs,
-+                                                    VCOS_THREAD_ENTRY_FN_T entry,
-+                                                    void *arg);
-+
-+/** Exit the thread from within the thread function itself.
-+  * Resources must still be cleaned up via a call to thread_join().
-+  *
-+  * The thread can also be terminated by simply exiting the thread function.
-+  *
-+  * @param data Data passed to thread_join. May be NULL.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_thread_exit(void *data);
-+
-+/** Wait for a thread to terminate and then clean up its resources.
-+  *
-+  * @param thread Thread to wait for
-+  * @param pData  Updated to point at data provided in vcos_thread_exit or exit
-+  * code of thread function.
-+  */
-+VCOSPRE_ void VCOSPOST_ vcos_thread_join(VCOS_THREAD_T *thread,
-+                             void **pData);
-+
-+
-+/**
-+  * \brief Create a thread using an API similar to the one "traditionally"
-+  * used under Nucleus.
-+  *
-+  * This creates a thread which must be cleaned up by calling vcos_thread_join().
-+  * The thread cannot be simply terminated (as in Nucleus and ThreadX) as thread
-+  * termination is not universally supported.
-+  *
-+  * @param thread       Filled in with thread instance
-+  * @param name         An optional name for the thread. NULL or "" may be used (but
-+  *                     a name will aid in debugging).
-+  * @param entry        Entry point
-+  * @param arg          A single argument passed to the entry point function
-+  * @param stack        Pointer to stack address
-+  * @param stacksz      Size of stack in bytes
-+  * @param priaff       Priority of task, between VCOS_PRI_LOW and VCOS_PRI_HIGH, ORed with the CPU affinity
-+  * @param autostart    If non-zero the thread will start immediately.
-+  * @param timeslice    Timeslice (system ticks) for this thread.
-+  *
-+  * @sa vcos_thread_terminate vcos_thread_delete
-+  */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_thread_create_classic(VCOS_THREAD_T *thread,
-+                                                            const char *name,
-+                                                            void *(*entry)(void *arg),
-+                                                            void *arg,
-+                                                            void *stack,
-+                                                            VCOS_UNSIGNED stacksz,
-+                                                            VCOS_UNSIGNED priaff,
-+                                                            VCOS_UNSIGNED timeslice,
-+                                                            VCOS_UNSIGNED autostart);
-+
-+/**
-+  * \brief Set a thread's priority
-+  *
-+  * Set the priority for a thread.
-+  *
-+  * @param thread  The thread
-+  * @param pri     Thread priority in VCOS_PRI_MASK bits; affinity in VCOS_AFFINITY_MASK bits.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_thread_set_priority(VCOS_THREAD_T *thread, VCOS_UNSIGNED pri);
-+
-+/**
-+  * \brief Return the currently executing thread.
-+  *
-+  */
-+VCOS_INLINE_DECL
-+VCOS_THREAD_T *vcos_thread_current(void);
-+
-+/**
-+  * \brief Return the thread's priority.
-+  */
-+VCOS_INLINE_DECL
-+VCOS_UNSIGNED vcos_thread_get_priority(VCOS_THREAD_T *thread);
-+
-+/**
-+  * \brief Return the thread's cpu affinity.
-+  */
-+VCOS_INLINE_DECL
-+VCOS_UNSIGNED vcos_thread_get_affinity(VCOS_THREAD_T *thread);
-+
-+/**
-+  * \brief Set the thread's cpu affinity.
-+  */
-+
-+VCOS_INLINE_DECL
-+void vcos_thread_set_affinity(VCOS_THREAD_T *thread, VCOS_UNSIGNED affinity);
-+
-+/**
-+  * \brief Query whether we are in an interrupt.
-+  *
-+  * @return 1 if in interrupt context.
-+  */
-+VCOS_INLINE_DECL
-+int vcos_in_interrupt(void);
-+
-+/**
-+  * \brief Sleep a while.
-+  *
-+  * @param ms Number of milliseconds to sleep for
-+  *
-+  * This may actually sleep a whole number of ticks.
-+  */
-+VCOS_INLINE_DECL
-+void vcos_sleep(uint32_t ms);
-+
-+/**
-+  * \brief Return the value of the hardware microsecond counter.
-+  *
-+  */
-+VCOS_INLINE_DECL
-+uint32_t vcos_getmicrosecs(void);
-+
-+#define vcos_get_ms() (vcos_getmicrosecs()/1000)
-+
-+/**
-+  * \brief Return a unique identifier for the current process
-+  *
-+  */
-+VCOS_INLINE_DECL
-+VCOS_UNSIGNED vcos_process_id_current(void);
-+
-+/** Relinquish this time slice. */
-+VCOS_INLINE_DECL
-+void vcos_thread_relinquish(void);
-+
-+/** Return the name of the given thread.
-+  */
-+VCOSPRE_ const char * VCOSPOST_ vcos_thread_get_name(const VCOS_THREAD_T *thread);
-+
-+/** Change preemption. This is almost certainly not what you want, as it won't
-+  * work reliably in a multicore system: although you can affect the preemption
-+  * on *this* core, you won't affect what's happening on the other core(s).
-+  *
-+  * It's mainly here to ease migration. If you're using it in new code, you
-+  * probably need to think again.
-+  *
-+  * @param pe New preemption, VCOS_PREEMPT or VCOS_NO_PREEMPT
-+  * @return Old value of preemption.
-+  */
-+VCOS_INLINE_DECL
-+VCOS_UNSIGNED vcos_change_preemption(VCOS_UNSIGNED pe);
-+
-+/** Is a thread still running, or has it exited?
-+  *
-+  * Note: this exists for some fairly scary code in the video codec tests. Don't
-+  * try to use it for anything else, as it may well not do what you expect.
-+  *
-+  * @param thread   thread to query
-+  * @return non-zero if thread is running, or zero if it has exited.
-+  */
-+VCOS_INLINE_DECL
-+int vcos_thread_running(VCOS_THREAD_T *thread);
-+
-+/** Resume a thread.
-+  *
-+  * @param thread thread to resume
-+  */
-+VCOS_INLINE_DECL
-+void vcos_thread_resume(VCOS_THREAD_T *thread);
-+
-+/*
-+ * Internal APIs - may not always be present and should not be used in
-+ * client code.
-+ */
-+
-+extern void _vcos_task_timer_set(void (*pfn)(void*), void *, VCOS_UNSIGNED ms);
-+extern void _vcos_task_timer_cancel(void);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,106 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - timer support
-+=============================================================================*/
-+
-+#ifndef VCOS_TIMER_H
-+#define VCOS_TIMER_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "interface/vcos/vcos_types.h"
-+#include "vcos_platform.h"
-+
-+/** \file vcos_timer.h
-+  *
-+  * Timers are single shot.
-+  *
-+  * Timer times are in milliseconds.
-+  *
-+  * \note that timer callback functions are called from an arbitrary thread
-+  * context. The expiration function should do its work as quickly as possible;
-+  * blocking should be avoided.
-+  *
-+  * \note On Windows, the separate function vcos_timer_init() must be called
-+  * as timer initialization from DllMain is not possible.
-+  */
-+
-+/** Perform timer subsystem initialization. This function is not needed
-+  * on non-Windows platforms but is still present so that it can be
-+  * called. On Windows it is needed because vcos_init() gets called
-+  * from DLL initialization where it is not possible to create a
-+  * time queue (deadlock occurs if you try).
-+  *
-+  * @return VCOS_SUCCESS on success. VCOS_EEXIST if this has already been called
-+  * once. VCOS_ENOMEM if resource allocation failed.
-+  */
-+VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_timer_init(void);
-+
-+/** Create a timer in a disabled state.
-+  *
-+  * The timer is initially disabled.
-+  *
-+  * @param timer     timer handle
-+  * @param name      name for timer
-+  * @param expiration_routine function to call when timer expires
-+  * @param context   context passed to expiration routine
-+  *
-+  */
-+VCOS_INLINE_DECL
-+VCOS_STATUS_T vcos_timer_create(VCOS_TIMER_T *timer,
-+                                const char *name,
-+                                void (*expiration_routine)(void *context),
-+                                void *context);
-+
-+
-+
-+/** Start a timer running.
-+  *
-+  * Timer must be stopped.
-+  *
-+  * @param timer     timer handle
-+  * @param delay     Delay to wait for, in ms
-+  */
-+VCOS_INLINE_DECL
-+void vcos_timer_set(VCOS_TIMER_T *timer, VCOS_UNSIGNED delay);
-+
-+/** Stop an already running timer.
-+  *
-+  * @param timer     timer handle
-+  */
-+VCOS_INLINE_DECL
-+void vcos_timer_cancel(VCOS_TIMER_T *timer);
-+
-+/** Stop a timer and restart it.
-+  * @param timer     timer handle
-+  * @param delay     delay in ms
-+  */
-+VCOS_INLINE_DECL
-+void vcos_timer_reset(VCOS_TIMER_T *timer, VCOS_UNSIGNED delay);
-+
-+VCOS_INLINE_DECL
-+void vcos_timer_delete(VCOS_TIMER_T *timer);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h	2012-10-17 18:57:47.000000000 +0200
-@@ -0,0 +1,211 @@
-+/*
-+ * Copyright (c) 2010-2011 Broadcom. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+/*=============================================================================
-+VideoCore OS Abstraction Layer - basic types
-+=============================================================================*/
-+
-+#ifndef VCOS_TYPES_H
-+#define VCOS_TYPES_H
-+
-+#define VCOS_VERSION   1
-+
-+#include "vcos_platform_types.h"
-+
-+#if !defined(VCOSPRE_) || !defined(VCOSPOST_)
-+#error VCOSPRE_ and VCOSPOST_ not defined!
-+#endif
-+
-+/* Redefine these here; this means that existing header files can carry on
-+ * using the VCHPOST/VCHPRE macros rather than having huge changes, which
-+ * could cause nasty merge problems.
-+ */
-+#ifndef VCHPOST_
-+#define VCHPOST_ VCOSPOST_
-+#endif
-+#ifndef VCHPRE_
-+#define VCHPRE_  VCOSPRE_
-+#endif
-+
-+/** Entry function for a lowlevel thread.
-+  *
-+  * Returns void for consistency with Nucleus/ThreadX.
-+  */
-+typedef void (*VCOS_LLTHREAD_ENTRY_FN_T)(void *);
-+
-+/** Thread entry point. Returns a void* for consistency
-+  * with pthreads.
-+  */
-+typedef void *(*VCOS_THREAD_ENTRY_FN_T)(void*);
-+
-+
-+/* Error return codes - chosen to be similar to errno values */
-+typedef enum
-+{
-+   VCOS_SUCCESS,
-+   VCOS_EAGAIN,
-+   VCOS_ENOENT,
-+   VCOS_ENOSPC,
-+   VCOS_EINVAL,
-+   VCOS_EACCESS,
-+   VCOS_ENOMEM,
-+   VCOS_ENOSYS,
-+   VCOS_EEXIST,
-+   VCOS_ENXIO,
-+   VCOS_EINTR
-+} VCOS_STATUS_T;
-+
-+/* Some compilers (MetaWare) won't inline with -g turned on, which then results
-+ * in a lot of code bloat. To overcome this, inline functions are forward declared
-+ * with the prefix VCOS_INLINE_DECL, and implemented with the prefix VCOS_INLINE_IMPL.
-+ *
-+ * That then means that in a release build, "static inline" can be used in the obvious
-+ * way, but in a debug build the implementations can be skipped in all but one file,
-+ * by using VCOS_INLINE_BODIES.
-+ *
-+ * VCOS_INLINE_DECL - put this at the start of an inline forward declaration of a VCOS
-+ * function.
-+ *
-+ * VCOS_INLINE_IMPL - put this at the start of an inlined implementation of a VCOS
-+ * function.
-+ *
-+ */
-+
-+/* VCOS_EXPORT - it turns out that in some circumstances we need the implementation of
-+ * a function even if it is usually inlined.
-+ *
-+ * In particular, if we have a codec that is usually provided in object form, if it
-+ * was built for a debug build it will be full of calls to vcos_XXX(). If this is used
-+ * in a *release* build, then there won't be any of these calls around in the main image
-+ * as they will all have been inlined. The problem also exists for vcos functions called
-+ * from assembler.
-+ *
-+ * VCOS_EXPORT ensures that the named function will be emitted as a regular (not static-inline)
-+ * function inside vcos_<platform>.c so that it can be linked against. Doing this for every
-+ * VCOS function would be a bit code-bloat-tastic, so it is only done for those that need it.
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+#define _VCOS_INLINE inline
-+#else
-+#define _VCOS_INLINE __inline
-+#endif
-+
-+#if defined(NDEBUG)
-+
-+#ifdef __GNUC__
-+# define VCOS_INLINE_DECL extern __inline__
-+# define VCOS_INLINE_IMPL static __inline__
-+#else
-+# define VCOS_INLINE_DECL static _VCOS_INLINE   /* declare a func */
-+# define VCOS_INLINE_IMPL static _VCOS_INLINE   /* implement a func inline */
-+#endif
-+
-+# if defined(VCOS_WANT_IMPL)
-+#  define VCOS_EXPORT
-+# else
-+#  define VCOS_EXPORT VCOS_INLINE_IMPL
-+# endif /* VCOS_WANT_IMPL */
-+
-+#define VCOS_INLINE_BODIES
-+
-+#else /* NDEBUG */
-+
-+#if !defined(VCOS_INLINE_DECL)
-+   #define VCOS_INLINE_DECL extern
-+#endif
-+#if !defined(VCOS_INLINE_IMPL)
-+   #define VCOS_INLINE_IMPL
-+#endif
-+#define VCOS_EXPORT VCOS_INLINE_IMPL
-+#endif
-+
-+#define VCOS_STATIC_INLINE static _VCOS_INLINE
-+
-+#if defined(__HIGHC__) || defined(__HIGHC_ANSI__)
-+#define _VCOS_METAWARE
-+#endif
-+
-+/** It seems that __FUNCTION__ isn't standard!
-+  */
-+#if __STDC_VERSION__ < 199901L
-+# if __GNUC__ >= 2 || defined(__VIDEOCORE__)
-+#  define VCOS_FUNCTION __FUNCTION__
-+# else
-+#  define VCOS_FUNCTION "<unknown>"
-+# endif
-+#else
-+# define VCOS_FUNCTION __func__
-+#endif
-+
-+#define _VCOS_MS_PER_TICK (1000/VCOS_TICKS_PER_SECOND)
-+
-+/* Convert a number of milliseconds to a tick count. Internal use only - fails to
-+ * convert VCOS_SUSPEND correctly.
-+ */
-+#define _VCOS_MS_TO_TICKS(ms) (((ms)+_VCOS_MS_PER_TICK-1)/_VCOS_MS_PER_TICK)
-+
-+#define VCOS_TICKS_TO_MS(ticks) ((ticks) * _VCOS_MS_PER_TICK)
-+
-+/** VCOS version of DATESTR, from pcdisk.h. Used by the hostreq service.
-+ */ 
-+typedef struct vcos_datestr
-+{
-+   uint8_t       cmsec;              /**< Centesimal mili second */
-+   uint16_t      date;               /**< Date */
-+   uint16_t      time;               /**< Time */
-+
-+} VCOS_DATESTR;
-+
-+/* Compile-time assert - declares invalid array length if condition
-+ * not met, or array of length one if OK.
-+ */
-+#define VCOS_CASSERT(e) extern char vcos_compile_time_check[1/(e)]
-+
-+#define vcos_min(x,y) ((x) < (y) ? (x) : (y))
-+#define vcos_max(x,y) ((x) > (y) ? (x) : (y))
-+
-+/** Return the count of an array. FIXME: under gcc we could make
-+ * this report an error for pointers using __builtin_types_compatible().
-+ */
-+#define vcos_countof(x) (sizeof((x)) / sizeof((x)[0]))
-+
-+/* for backward compatibility */
-+#define countof(x) (sizeof((x)) / sizeof((x)[0]))
-+
-+#define VCOS_ALIGN_DOWN(p,n) (((ptrdiff_t)(p)) & ~((n)-1))
-+#define VCOS_ALIGN_UP(p,n) VCOS_ALIGN_DOWN((ptrdiff_t)(p)+(n)-1,(n))
-+
-+/** bool_t is not a POSIX type so cannot rely on it. Define it here.
-+  * It's not even defined in stdbool.h.
-+  */
-+typedef int32_t vcos_bool_t;
-+typedef int32_t vcos_fourcc_t;
-+
-+#define VCOS_FALSE   0
-+#define VCOS_TRUE    (!VCOS_FALSE)
-+
-+/** Mark unused arguments to keep compilers quiet */
-+#define vcos_unused(x) (void)(x)
-+
-+/** For backward compatibility */
-+typedef vcos_fourcc_t fourcc_t;
-+typedef vcos_fourcc_t FOURCC_T;
-+
-+#endif
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/Kconfig linux-3.6.2.vc04_patch/drivers/misc/vc04_services/Kconfig
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/Kconfig	2012-10-21 15:15:09.996259654 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/Kconfig	2012-10-17 18:57:47.000000000 +0200
-@@ -1,10 +1,7 @@
- config BCM2708_VCHIQ
- 	tristate "Videocore VCHIQ"
- 	depends on MACH_BCM2708
--	default y
--	help
--		Kernel to VideoCore communication interface for the
--		BCM2708 family of products.
--		Defaults to Y when the Broadcom Videocore services
--		are included in the build, N otherwise.
-+        default y
-+        help
-+          Helper for communication for VideoCore.
- 
-diff -Naur linux-3.6.2.rpi_patch/drivers/misc/vc04_services/Makefile linux-3.6.2.vc04_patch/drivers/misc/vc04_services/Makefile
---- linux-3.6.2.rpi_patch/drivers/misc/vc04_services/Makefile	2012-10-21 15:15:09.997259673 +0200
-+++ linux-3.6.2.vc04_patch/drivers/misc/vc04_services/Makefile	2012-10-17 18:57:47.000000000 +0200
-@@ -1,18 +1,21 @@
--ifeq ($(CONFIG_MACH_BCM2708),y)
--
- obj-$(CONFIG_BCM2708_VCHIQ)	+= vchiq.o
- 
- vchiq-objs := \
-    interface/vchiq_arm/vchiq_core.o  \
-+   interface/vchiq_arm/vchiq_shim.o  \
-+   interface/vchiq_arm/vchiq_util.o  \
-    interface/vchiq_arm/vchiq_arm.o \
-    interface/vchiq_arm/vchiq_kern_lib.o \
-    interface/vchiq_arm/vchiq_2835_arm.o \
--   interface/vchiq_arm/vchiq_proc.o \
--   interface/vchiq_arm/vchiq_shim.o \
--   interface/vchiq_arm/vchiq_util.o \
--   interface/vchiq_arm/vchiq_connected.o \
-+   interface/vcos/linuxkernel/vcos_linuxkernel.o \
-+   interface/vcos/linuxkernel/vcos_thread_map.o \
-+   interface/vcos/linuxkernel/vcos_linuxkernel_cfg.o \
-+   interface/vcos/generic/vcos_generic_event_flags.o \
-+   interface/vcos/generic/vcos_logcat.o \
-+   interface/vcos/generic/vcos_mem_from_malloc.o \
-+   interface/vcos/generic/vcos_cmd.o
-+
-+EXTRA_CFLAGS += -DVCOS_VERIFY_BKPTS=1 -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel
- 
--EXTRA_CFLAGS += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000
- 
--endif
- 
diff --git a/packages/linux/patches/linux-3.6.7-603-RPi_vc04-service_buildfix.patch b/packages/linux/patches/linux-3.6.7-603-RPi_vc04-service_buildfix.patch
deleted file mode 100644
index 00968b5f25..0000000000
--- a/packages/linux/patches/linux-3.6.7-603-RPi_vc04-service_buildfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.6.2.buildfix_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
---- linux-3.6.2.vc04_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	2012-10-17 18:57:47.000000000 +0200
-+++ linux-3.6.2.buildfix_patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	2012-10-21 15:19:56.706236450 +0200
-@@ -126,7 +126,7 @@
- 	}
- 
- 	err = request_irq(VCHIQ_DOORBELL_IRQ, vchiq_doorbell_irq,
--		IRQF_SAMPLE_RANDOM | IRQF_IRQPOLL, "VCHIQ doorbell",
-+		IRQF_IRQPOLL, "VCHIQ doorbell",
- 		state);
- 	if (err < 0)
- 	{